Merge pull request #220 from mpeuster/merge-openstack-apis