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