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