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