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