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