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