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