ENG-5698 Fix 2 new potential planner issues found by findbugs.
Merge pull request #1072 from VoltDB/master

Refresh from master.
Merge pull request #1077 from VoltDB/ENG-5698-findbugs

Eng 5698 findbugs