Another round of changes for tempest bc
Merge pull request #643 from dpaterson/pull-req-release-mesa-1.6-master-53baf52e3d4b01b2c82ac3b2428eb623a7e83e8d

https://github.com/crowbar/barclamp-crowbar/pull/643

Merged by devtool for ArkadyKanevsky