moved imports out of functions, removed exception handler for upgrade/install/remove
moved imports out of functions, removed exception handler for upgrade/install/remove

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