crowbar/barclamp-heat — pull request #45 by vuntz (2014-03-13 08:06:15+00:00)
Title: Merge roxy branch into stoney

I did a merge instead of cherry-picking commits. I can cherry-pick if preferred.