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