Merge branch 'environment-source-pr' into environmentSource

* environment-source-pr:
  refactor(build): replace `source` in environments with `environmentDefault` entry
  refactor(build): replace `source` in environments with `environmentDefault` entry

# Conflicts:
#	packages/angular-cli/models/webpack-build-test.js

Author: jsanchezgarcia

packages/angular-cli/models/webpack-build-test.js

@@ -128,7 +128,7 @@ const getWebpackTestConfig = function (projectRoot, environment, appConfig, test
         // This plugin is responsible for swapping the environment files.
         // Since it takes a RegExp as first parameter, we need to escape the path.
         // See https://webpack.github.io/docs/list-of-plugins.html#normalmodulereplacementplugin
-        new RegExp(path.resolve(appRoot, appConfig.['environmentSource'])
+        new RegExp(path.resolve(appRoot, appConfig['environmentSource'])
           .replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&')),
         path.resolve(appRoot, appConfig.environments[environment])
       ),