Merge remote-tracking branch 'remotes/origin/2.0' into ElasticSearch

Author: Alex Paliarush

Diff for: CHANGELOG.md

@@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
  - It is now possible to use spaces in path to vagrant project on Windows. On OSX and Linux hosts it works in non-NFS mode, in NFS mode it does not work because of [bug in vagrant](mitchellh/vagrant#7540)
+ - Fixed issue with MySQL being down after VM power off
 
 ### Added
 

Diff for: etc/config.yaml.dist

@@ -1,5 +1,5 @@
 repository_url:
-  # [To apply changes: init-project -c]
+  # [To apply changes: init-project -fc]
   ce: "git@github.com:magento/magento2.git"
   ee: ""
 guest:

Diff for: init_project.sh

@@ -84,6 +84,14 @@ bash "${vagrant_dir}/scripts/host/composer.sh" install
 cd "${vagrant_dir}"
 vagrant up
 
+echo "Configuring PhpStorm..."
+if [[ ${force_project_cleaning} -eq 1 ]] && [[ ${force_phpstorm_config_cleaning} -eq 1 ]]; then
+    rm -rf "${vagrant_dir}/.idea"
+fi
+if [[ ! -f "${vagrant_dir}/.idea/deployment.xml" ]]; then
+    bash "${vagrant_dir}/scripts/host/configure_php_storm.sh"
+fi
+
 if [[ ${host_os} == "Windows" ]] || [[ ${use_nfs} == 0 ]]; then
     # Automatic switch to EE during project initialization cannot be supported on Windows
     bash "${vagrant_dir}/m-reinstall"
@@ -96,14 +104,6 @@ else
 fi
 
 set +x
-echo "Configuring PhpStorm..."
-if [[ ${force_project_cleaning} -eq 1 ]] && [[ ${force_phpstorm_config_cleaning} -eq 1 ]]; then
-    rm -rf "${vagrant_dir}/.idea"
-fi
-if [[ ! "$(ls -A "${vagrant_dir}/.idea")" ]]; then
-    bash "${vagrant_dir}/scripts/host/configure_php_storm.sh"
-fi
-
 bold=$(tput bold)
 regular=$(tput sgr0)
 echo "

Diff for: scripts/provision/upgrade_environment_recurring.sh

@@ -49,4 +49,7 @@ is_varnish_installed="$(isServiceAvailable varnish)"
 if [[ ${is_varnish_installed} -eq 0 ]]; then
     apt-get update
     apt-get install -y varnish
-fi
+fi
+
+# Fix issue with MySQL being down after VM power off
+service mysql restart