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