master
No namespaced test packages
Small improvements to the formulas tests
Merge remote-tracking branch 'saltstack/3007.x' into merge/master/3007.x
Merge 3007.x into master