Merge branch '7.1' into 7.2

* 7.1:
  fix integration tests

Author: xabbuh

phpunit.xml.dist

@@ -25,7 +25,7 @@
         <env name="ZOOKEEPER_HOST" value="localhost" />
         <env name="COUCHBASE_HOST" value="localhost" />
         <env name="COUCHBASE_USER" value="Administrator" />
-        <env name="COUCHBASE_PASS" value="111111%40" />
+        <env name="COUCHBASE_PASS" value="111111@" />
     </php>
 
     <testsuites>

src/Symfony/Component/Cache/phpunit.xml.dist

@@ -15,7 +15,7 @@
         <env name="MEMCACHED_HOST" value="localhost" />
         <env name="COUCHBASE_HOST" value="localhost" />
         <env name="COUCHBASE_USER" value="Administrator" />
-        <env name="COUCHBASE_PASS" value="111111%40" />
+        <env name="COUCHBASE_PASS" value="111111@" />
     </php>
 
     <testsuites>