Openstack-setup.sh file changes
Merge branch 'master' of https://github.com/CiscoSystems/jujucharm-n1k