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