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