Merge "ssh before shelve to avoid ssh failures"