Mirantis/fuel — pull request #848 by angdraug (2013-11-14 23:11:29+00:00)
Title: Havana merge mopup

Recover commits that were missed in the 3.2->4.0 master branch rebase.