Mirantis/fuel — pull request #766 by xenolog (2013-10-30 16:09:56+00:00)
Title: some fixes for Havana

include: PRD-2528, PRD-2558