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