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