application changes for new apache layout
apply missing DefaultSettings change
Merge branch 'release-205' into release-205-plus-owen-layout
Merge branch 'release-205' into release-205-plus-owen-layout
Merge pull request #2482 from Wikia/release-205-plus-owen-layout

Release 205 plus owen layout