Merge "Add a few tests for cinder multiattach"