fix restart-nova-services for both nova-api and nova-api-metadata
Merge branch 'master' of https://github.com/jowolf/openstack-standalone-formula