Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d

src/plugins/coreplugin/id.cpp

@@ -73,7 +73,7 @@ public:
         : n(length), str(s)
     {
         if (!n)
-            length = n = strlen(s);
+            length = n = static_cast<int>(strlen(s));
         h = 0;
         while (length--) {
             h = (h << 4) + *s++;