Convert testing, remove CMDBclient, incorporate Openstack-specific IP calculation as OS-specific
Merge remote-tracking branch 'origin'