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