Merge branch '2.7' into 2.8

* 2.7:
  [2.7] Fix tests
  pass triggerDeprecationError arg to parent class
  remove default null value for asset version
  remove duplicated value
  [DependencyInjection] simplify the BC layer
  Change couple of occurences of a public setUp() method to protected

Author: fabpot

DependencyInjection/Configuration.php

@@ -600,7 +600,6 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                                 ->fixXmlConfig('base_url')
                                 ->children()
                                     ->scalarNode('version')
-                                        ->defaultNull()
                                         ->beforeNormalization()
                                         ->ifTrue(function ($v) { return '' === $v; })
                                         ->then(function ($v) { return; })