fix rpm deployment prefixes.
Merge remote-tracking branch 'origin/rpm-fix'