Rebase from 'release/hydro/sdf_tracker'
Placing rpm template files