Reset to develop version of loader.py for develop
Reset to develop version of loader.py for develop

Fixes errors from backport and then merge forward

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt