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