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