When generating the RadosGW VHost, add support for optional ServerAliases.
Conform to coding standards.
Merge branch 'rgw_host_aliases' into cdmaster

Conflicts:
	templates/default/rgw.conf.erb