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