Fix openstack-labs inheritance and dependencies

https://issues.apache.org/jira/browse/JCLOUDS-104