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