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