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