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