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