merge from upstream and fix conflicts
merge from upstream and fix conflicts

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