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