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