Merge "Add tags to baremetal cron removal tasks" into stable/pike