Merge "Actually attach a volume to an instance before taking snapshot"