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