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