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