BZ #1104093 - Tweak settings for ML2 as default

This line needs to go, we dont want to override the puppet default for core_driver anymore