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