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