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