Updated service types for OpenStack/Rackspace services
Merge remote-tracking branch 'upstream/master'