merge trunk
merge trunk

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