fixed setup.py
Merge branch 'develop' into feature/CFY-443-Teardown-Openstack-provder-should-store-resources-ids