sync up with internal update.
Merge branch 'master' of https://github.com/OpenDeployment/chef-openstack-cookbooks

Conflicts:
	cookbooks/openstack-compute/attributes/default.rb
	cookbooks/openstack-compute/recipes/libvirt.rb