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