Merge pull request #87 from galthaus/pull-req-release-fred-master-ac2caceeb9

Nova volume fixes after testing and finding new issue. [1/1]
Make sure that the rabbit mq test uses the admin ip address and not the public ip.
Make the api controller node be the volume endpoint, but allow for any number of volume servers.
Fix mass status test for nova in nagios
Merge pull request #88 from galthaus/pull-req-release-fred-master-8080bd2ae2

Thank you for the excellent writeup
Update nova python files to include versions that match our packages.
Merge pull request #92 from galthaus/pull-req-release-betty-master-e8006d7025

Merge nova code that we replace in-line with our packages. [1/1]
Merge remote-tracking branch 'dell/feature/folsom/master' into bet
Merge branch 'agordeev/feature/folsom/master' into feature/folsom/betty/master
Add simplest Cinder support

Conflicts:

	chef/cookbooks/nova/recipes/volume.rb
	chef/data_bags/crowbar/bc-template-nova.json
	crowbar_framework/app/models/nova_service.rb

trying to cherry-pick cinder support from pfs
trying to cherry pick cinder support from pfs
Merge pull request #2 from MirantisDellCrowbar/feature/cinder/betty/folsom

Feature/cinder/betty/folsom