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