Merge "Add openstack clean-up cron, simplify ci-job defs"