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