CLEARWATER: XOP-311: Modifications for VM Shutdown

Raise it on behalf of @siddharthv as we need to put these in today.