Merge pull request #6062 from hoisie/five-steps

Rebalance CircleCI to use 5 jobs instead of 6