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