Merge "Manually set healthchecks for _cron services" into stable/pike