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