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