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