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