ENG-5660 resovle various issues with rpm packaging for v4.next
Merge pull request #1061 from VoltDB/ENG-5660-resolve-rpm-packaging-v4next

ENG-5660 resovle various issues with rpm packaging for v4.next