Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix deps dir for test data preparations

Author: weltling

appveyor/test_task.bat

@@ -4,7 +4,14 @@ set NO_INTERACTION=1
 set REPORT_EXIT_STATUS=1
 set SKIP_IO_CAPTURE_TESTS=1
 
-set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%APPVEYOR_REPO_BRANCH%
+if /i "%APPVEYOR_REPO_BRANCH:~0,4%" equ "php-" (
+	set BRANCH=%APPVEYOR_REPO_BRANCH:~4,3%
+	set STABILITY=stable
+) else (
+	set BRANCH=master
+	set STABILITY=staging
+)
+set DEPS_DIR=%PHP_BUILD_CACHE_BASE_DIR%\deps-%PHP_SDK_VC%-%PHP_SDK_ARCH%-%BRANCH%
 
 rem setup MySQL related exts
 set MYSQL_PWD=Password12!