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