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