Merge "Adds <service>-api to map to openstack-api-site in Launchpad"