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