ENG-5660 resovle various issues with rpm packaging for v4.next
reverted two partition commit. resolved merge conflict in MpScheduler
Merge pull request #1060 from VoltDB/revert-two-partition-tx

reverted two partition commit. resolved merge conflict in MpScheduler
Merge pull request #1061 from VoltDB/ENG-5660-resolve-rpm-packaging-v4next

ENG-5660 resovle various issues with rpm packaging for v4.next
Merge branch 'master' of github.com:VoltDB/voltdb into ENG-5669-having-bug