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