OpenstackClient
Merge branch 'master' of https://github.com/ssbanerje/SimianArmy

Conflicts:
	src/main/java/com/netflix/simianarmy/client/openstack/OpenstackClient.java