Merge "Fix rpm packaging following review 21188" into guppy