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