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