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