bump RPM packaging version
Merge remote branch 'upstream/develop' into develop