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