Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev