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