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