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