fixing cinder typo, make sure Nova service is 
not verbose logging
Merge remote-tracking branch 'origin/folsom' into folsom

Conflicts:
	folsom/folsom-cinder.sh