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