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