Feature/cloudify 2159 openstack refactor

Refactor and fix tests.