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