Bug 1048644: removes old openstack nodes, adds new nodes; a=nodechange
Merge default -> production

--HG--
branch : production