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