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