Merge remote-tracking branch 'remotes/dev/4.1' into 4.1

Vagrantfile

@@ -132,6 +132,7 @@ Vagrant.configure("2") do |config|
     php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && php composer-setup.php
     php -r "unlink('composer-setup.php');"
     mv composer.phar /usr/bin/composer
+    composer self-update --1
     su - vagrant -c 'composer global require symfony/flex'
 
     echo "\n~~~~~~~~~~~~~~ Enable Installed Services ~~~~~~~~~~~~~~\n"
@@ -259,9 +260,9 @@ ____NGINXCONFIGTEMPLATE
 
     su - vagrant -c 'composer install --prefer-dist --no-dev --optimize-autoloader -n --working-dir=/var/www/oroapp'
 
-    sed -i "s/database_user:[ ]*root/database_user: $DB_USER/g" ./config/parameters.yml
-    sed -i "s/database_password:[ ]*null/database_password: $DB_PASSWORD/g" ./config/parameters.yml
-    sed -i "s/database_name:[ ]*[a-zA-Z0-9_]*/database_name: $DB_NAME/g" ./config/parameters.yml
+    sed -i "/database_user/s/:[[:space:]].*$/: $DB_USER/g" ./config/parameters.yml
+    sed -i "/database_password/s/:[[:space:]].*$/: '$DB_PASSWORD'/g" ./config/parameters.yml
+    sed -i "/database_name/s/:[[:space:]].*$/: $DB_NAME/g" ./config/parameters.yml
     chown vagrant:vagrant /var/www/oroapp/config/parameters.yml
 
     echo "\n~~~~~~~~~~~~~~ Install OroCRM Community Edition Application ~~~~~~~~~~~~~~\n"

composer.json

@@ -39,6 +39,7 @@
         "behat/mink-extension": "2.3.*",
         "behat/mink-selenium2-driver": "1.3.1",
         "behat/symfony2-extension": "2.1.*",
+    "guzzlehttp/guzzle": "^6.0.0",
         "nelmio/alice": "3.6.*",
         "theofidry/alice-data-fixtures": "1.0.*",
         "phpunit/phpunit": "7.5.*",

dev.json

@@ -57,6 +57,7 @@
     "behat/mink-extension": "2.3.*",
     "behat/mink-selenium2-driver": "1.3.1",
     "behat/symfony2-extension": "2.1.*",
+    "guzzlehttp/guzzle": "^6.0.0",
     "nelmio/alice": "3.6.*",
     "theofidry/alice-data-fixtures": "1.0.*",
     "phpunit/phpunit": "7.5.*",