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