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