Merge "Add openstack-single-node-xenial nodeset"