Merge branch 'master' of github.com:jmvh/openstack-java-sdk
Merge branch 'master' of github.com:jmvh/openstack-java-sdk