Merge remote-tracking branch 'origin/2.0' into varnish_support

Author: Hayder Sharhan

scripts/provision/configure_environment_recurring.sh

@@ -11,6 +11,9 @@ function process_php_config () {
             sed -i "s|display_errors = Off|display_errors = On|g" ${php_ini_path}
             sed -i "s|display_startup_errors = Off|display_startup_errors = On|g" ${php_ini_path}
             sed -i "s|error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT|error_reporting = E_ALL|g" ${php_ini_path}
+
+            # TODO: Fix for a bug, should be removed in 3.0
+            sed -i "s|:/vendor/phpunit/phpunit|:${guest_magento_dir}/vendor/phpunit/phpunit|g" ${php_ini_path}
         fi
     done
 }
@@ -28,6 +31,7 @@ function init_php56 () {
 # Enable trace printing and exit on the first error
 set +x
 
+guest_magento_dir=$2
 use_php7=$4
 vagrant_dir="/vagrant"