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