Merge change 6088 into donut

* changes:
  WifiManager: Limit the number of WifiLocks that can be active simultaneously.