Proper minion config setup
Proper minion config initialization
Add required imports
Proper minion config initialization. Fix test.
Switch imports and revert the assert to what it was.
Merge pull request #18638 from s0undt3ch/2014.7

Some 2014.7 test fixes