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