Merge "Fix failing compute volume attachment tests."