Merge remote-tracking branch 'origin/4.3' into 4.4

Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

This temporarily breaks handling of IRunControlFactory priorities.

Change-Id: Ibbc3c296ac82179f8e627a77436db2ac8fd505a2

src/plugins/projectexplorer/runconfiguration.cpp

@@ -538,6 +538,19 @@ IRunConfigurationAspect *IRunControlFactory::createRunConfigurationAspect(RunCon
     than it needs to be.
 */
 
+
+const char PRIORITY_KEY[] = "RunControlFactoryPriority";
+
+int ProjectExplorer::IRunControlFactory::priority() const
+{
+    return property(PRIORITY_KEY).toInt(); // 0 by default.
+}
+
+void IRunControlFactory::setPriority(int priority)
+{
+    setProperty(PRIORITY_KEY, priority);
+}
+
 namespace Internal {
 
 enum class RunWorkerState