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