Updates to address openstack's changes to security groups and rules.
	modified:   service/drivers/openstackUserManager.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	service/drivers/openstackUserManager.py