Rebase from 'release/hydro/pr2_props_app'
Placing rpm template files