Merge "Adds "retype" to "volume/admin/test_volume_types.py""