Updated openstack/openstack
Project: openstack/sahara  45ee1b08e04289574d0d54c32471ee2e32d5e093

Removed code duplication on cluster state change

Also changed str to six.text_type for py3 compatibility

Change-Id: Ic4dc280cc2dc59ecdc1df77b9c0737d35bfa984c