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