Merge "[rdkb][common][app][Refactor hostapd default config]"