Merge "Make test_tagged_attachment wait for SSHABLE"