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