Merge "Use immutable default values for args"

diff --cc cinder/api/xmlutil.py
Simple merge

diff --cc cinder/scheduler/driver.py
Simple merge

diff --cc cinder/scheduler/filter_scheduler.py
Simple merge

diff --cc cinder/tests/brick/test_brick_connector.py
Simple merge

diff --cc cinder/transfer/api.py
Simple merge

diff --cc cinder/volume/drivers/netapp/utils.py
Simple merge

diff --cc cinder/volume/drivers/vmware/vmdk.py
Simple merge

diff --cc cinder/volume/qos_specs.py
Simple merge

diff --cc cinder/volume/volume_types.py
Simple merge