venv support
typo
broken keystone in venv
Merge branch 'feature/pfs/betty/grizzly' into feature/grizzly/master

Conflicts:
	chef/cookbooks/quantum/recipes/server.rb
	chef/data_bags/crowbar/bc-template-quantum.json