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