Merge remote-tracking branch 'origin/Guest-Configs' into Guest-Configs

Author: Alexander Paliarush

scripts/provision/configure_environment_recurring.sh

@@ -1,10 +1,18 @@
 #!/usr/bin/env bash
 
+# Enable trace printing and exit on the first error
+set +x
+
 link_configs
 
 # Make sure configs are restored on system halt and during reboot
 if [ ! -f /etc/init.d/K04-unlink-configs ]; then
     ln -s /vagrant/scripts/guest/unlink_configs /etc/init.d/K04-unlink-configs
     ln -s /etc/init.d/K04-unlink-configs /etc/rc0.d/K04-unlink-configs
     ln -s /etc/init.d/K04-unlink-configs /etc/rc6.d/K04-unlink-configs
+fi
+
+# Upgrade existing environment
+if [ -f /vagrant/.idea/deployment.xml ]; then
+    sed -i.back "s|magento2ce/var/generation|magento2ce/var|g" "/vagrant/.idea/deployment.xml"
 fi