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