BZ #1104093 - Tweak settings for ML2 as default.

ML2 changes should be on controller_only_.