Merging mesa-1.6.1 fix into roxy:

De-spaghettify some of the code in voume.rb by splitting it into
smaller functions.
Merge pull request #95 from cdearborn/pull-req-release-roxy-master-5d2f18cdd97370f8af544e424e6fef9fd0f2f38c

https://github.com/crowbar/barclamp-cinder/pull/95

Merged by devtool for ArkadyKanevsky