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