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