Add ceilometer support
Merge branch 'feature/DCB-72/pfs/betty/grizzly' into feature/grizzly/master

Conflicts:
	chef/cookbooks/swift/templates/default/proxy-server.conf.erb