SCRUM-1896 - accidentally merged out rpm packaging
Merge remote-tracking branch 'remotes/origin/master-SCRUM-1869'