Merge "Fix bug reporting CPU count." into jb-mr2-dev