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