Merge with undercloud 2-node setup and tidy up