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