Merge "Keep AvailFreqMaps when netconf session restores"