diff --git a/composer.json b/composer.json
index 05a862aa1..eeaaf0b7d 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
   "license": "GPL-2.0",
   "require": {
     "drupal/console":                   "~1",
-    "phing/phing":                       "2.*",
+    "phing/phing":                      "~2",
     "phpunit/phpunit":                  "~5.4",
     "squizlabs/php_codesniffer":        "^2.4",
     "symfony/yaml":                     "~2.7",
diff --git a/composer.lock b/composer.lock
index 07d992480..f33a12bd0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8dd09926e0b0b1b2f4d8e3ea985bf71a",
-    "content-hash": "713211a890b1b7bf03627a6d6839a1d5",
+    "hash": "de6f11ac98767d7792617f93306f9f95",
+    "content-hash": "c8ec97172ce549b9d70b47e626d0453a",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -849,16 +849,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.5.2",
+            "version": "1.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc"
+                "reference": "94e5ca3e90aa5b34663780393e10914f7438f991"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/da8529775f14f4fdae33f916eb0cf65f6afbddbc",
-                "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/94e5ca3e90aa5b34663780393e10914f7438f991",
+                "reference": "94e5ca3e90aa5b34663780393e10914f7438f991",
                 "shasum": ""
             },
             "require": {
@@ -887,7 +887,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2016-09-06 16:07:05"
+            "time": "2016-09-07 15:34:10"
         },
         {
             "name": "padraic/humbug_get_contents",
@@ -1000,16 +1000,16 @@
         },
         {
             "name": "phing/phing",
-            "version": "2.14.0",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phingofficial/phing.git",
-                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61"
+                "reference": "bbfcaee391123220fc54e9c6feffeeea3c8775b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/7dd73c83c377623def54b58121f46b4dcb35dd61",
-                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/bbfcaee391123220fc54e9c6feffeeea3c8775b7",
+                "reference": "bbfcaee391123220fc54e9c6feffeeea3c8775b7",
                 "shasum": ""
             },
             "require": {
@@ -1032,6 +1032,7 @@
                 "phpunit/phpunit": ">=3.7",
                 "sebastian/git": "~1.0",
                 "sebastian/phpcpd": "2.x",
+                "siad007/versioncontrol_hg": "^1.0",
                 "squizlabs/php_codesniffer": "~2.2",
                 "symfony/yaml": "~2.7"
             },
@@ -1046,6 +1047,7 @@
                 "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
                 "phpunit/phpunit": "The PHP Unit Testing Framework",
                 "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
+                "siad007/versioncontrol_hg": "A library for interfacing with Mercurial repositories.",
                 "tedivm/jshrink": "Javascript Minifier built in PHP"
             },
             "bin": [
@@ -1054,7 +1056,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.14.x-dev"
+                    "dev-master": "2.15.x-dev"
                 }
             },
             "autoload": {
@@ -1087,7 +1089,7 @@
                 "task",
                 "tool"
             ],
-            "time": "2016-03-10 21:39:23"
+            "time": "2016-09-14 19:38:14"
         },
         {
             "name": "phpdocumentor/reflection-common",
diff --git a/template/composer.json b/template/composer.json
index 038d488a2..c5a3dbc6e 100644
--- a/template/composer.json
+++ b/template/composer.json
@@ -20,7 +20,6 @@
     "drupal/search_api":                          "8.1.0-alpha14",
     "drupal/search_api_solr":                     "8.1.0-alpha3",
     "drupal/security_review":                     "8.*",
-    "drupal-composer/drupal-scaffold":            "^2.0.0",
     "drupal-composer/drupal-security-advisories": "8.0.x-dev",
     "roave/security-advisories":                  "dev-master"
   },
@@ -34,9 +33,10 @@
     "drupal/coder":                 "~8.2",
     "drupal/drupal-extension":      "~3.0",
     "drush/drush":                  "^9.0",
+    "drupal-composer/drupal-scaffold": "^2.0.0",
     "jakoch/phantomjs-installer":   "dev-master as 1.9.8",
     "jarnaiz/behat-junit-formatter": "^1.2",
-    "phing/phing":                  "dev-master#0ef30e55bb5871cb38903cc0ee9d76074118a22c",
+    "phing/phing":                  "~2",
     "phpunit/phpunit":             "~5.4",
     "squizlabs/php_codesniffer":    "2.*"
   },