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