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