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