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