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