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