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