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