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