merge lp:~armando-migliaccio/nova/refactoring
merge lp:~armando-migliaccio/nova/refactoring

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