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