Merge "Fix how QUnit.newMwEnvironment merges live and custom settings"