Pre-SaltConf changes
Pre-SaltConf patches.