Merge b-i to m-c

b2g/config/gaia.json

@@ -1,4 +1,4 @@
 {
-    "revision": "ebb5c473c94911bb98acff5d46f6af209c12583e", 
+    "revision": "06ea7706d72174637b5f956122f52200d3f81fda", 
     "repo_path": "/integration/gaia-central"
 }

dom/bluetooth/BluetoothHfpManager.cpp

@@ -1653,14 +1653,8 @@ BluetoothHfpManager::ConnectSco(BluetoothReplyRunnable* aRunnable)
 bool
 BluetoothHfpManager::DisconnectSco()
 {
-  if (!IsConnected()) {
+  if (!IsScoConnected()) {
-    BT_WARNING("BluetoothHfpManager is not connected");
+    BT_WARNING("SCO has been already disconnected.");
-    return false;
-  }
-
-  SocketConnectionStatus status = mScoSocket->GetConnectionStatus();
-  if (status != SOCKET_CONNECTED && status != SOCKET_CONNECTING) {
-    BT_WARNING("No SCO exists");
     return false;
   }
 

dom/wifi/WifiWorker.js

@@ -2348,7 +2348,7 @@ function WifiWorker() {
       self.networksArray = [];
       for (let i = 1; i < lines.length; ++i) {
         // bssid / frequency / signal level / flags / ssid
-        var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s+(.*)/.exec(lines[i]);
+        var match = /([\S]+)\s+([\S]+)\s+([\S]+)\s+(\[[\S]+\])?\s(.*)/.exec(lines[i]);
 
         if (match && match[5]) {
           let ssid = match[5],