Merge "Move cleanup orphaned nodes into openstack-cron"