Revert start/shutdown action changes and add timeout to start/shutdown salt requests (OMS-497)