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