Changes to imports to comport with test suite changes in develop
Changes to imports to comport with test suite changes in develop

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