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