Merge remote-tracking branch 'origin/fido' into jethro

   origin/fido:
   qt5: update submodules
   Add connman patch to disable connman with boot over nfs

Conflicts:
   recipes-qt/qt5/nativesdk-qtbase_git.bbappend
   recipes-qt/qt5/qtbase-native_git.bbappend
   recipes-qt/qt5/qtbase_git.bbappend
   recipes-qt/qt5/qtwebengine_git.bbappend

Change-Id: Ie5a4e534f4a24034750e8c3964fbb5574ce434cd

recipes/connman/connman_%.bbappend

+##############################################################################
+##
+## Copyright (C) 2016 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:COMM$
+##
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## $QT_END_LICENSE$
+##
+##############################################################################
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://0001-disable-connman-when-booting-over-nfs.patch"

recipes/connman/files/0001-disable-connman-when-booting-over-nfs.patch

+From ccc6013f1e55b67981fb336aba657aea1520aeda Mon Sep 17 00:00:00 2001
+From: Mikko Gronoff <mikko.gronoff@qt.io>
+Date: Tue, 20 Sep 2016 11:02:50 +0300
+Subject: [PATCH] Disable connman when booting over NFS
+
+---
+ src/connman.service.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/connman.service.in b/src/connman.service.in
+index 8f7f342..8470f91 100644
+--- a/src/connman.service.in
++++ b/src/connman.service.in
+@@ -3,6 +3,7 @@ Description=Connection service
+ After=dbus.service network-pre.target
+ Before=network.target remote-fs-pre.target
+ Wants=network.target remote-fs-pre.target
++ConditionKernelCommandLine=!root=/dev/nfs
+ 
+ [Service]
+ Type=dbus