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