Merge "Fix TypeError in TestVolumeBootPattern"