Fixes based on code review 27001.
Fixes based on code review 27001.

openstack-attic/melange,rajarammallya/melange,rajarammallya/melange,openstack-attic/melange,rackerlabs/melange,rackerlabs/melange,rackerlabs/melange,rajarammallya/melange,openstack-attic/melange