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