Merge "Remove baremetal cron jobs on docker upgrade"