Merge r15042 to 8.09 (part 2 of brcm-2.4 multi-ssid fix)