BC Break: Restored noDeepMerging to Configuration

When performNoDeepMerging is not used, Symfony environment-specific server configurations no longer work.
Merge remote-tracking branch 'upstream/pr/684' into 3.0.x
Fix travis version command
another one?
Modify index mapping builder