ENG-5156 fix recent NPE
Fix the upfavored plan
Merge pull request #840 from VoltDB/ENG-5156-timebox-plan-differs

Eng 5156 timebox plan differs
Merge pull request #844 from VoltDB/release-3.7

Back-merge from Release 3.7