I also fixed the rgw class and used the 'name as default' approach which removed the need for one additional variable. Removed the servcie_provider variable from the params class. Change-Id: I404421da5df78e06241fd32b52f3b850780901fe