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