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