Merge remote-tracking branch 'origin/4.7'

Conflicts:
	src/plugins/clangtools/clangtoolruncontrol.cpp
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f

src/plugins/autotest/testtreeitem.cpp

@@ -297,6 +297,11 @@ bool TestTreeItem::isGroupNodeFor(const TestTreeItem *other) const
     return QFileInfo(other->filePath()).absolutePath() == filePath();
 }
 
+bool TestTreeItem::isGroupable() const
+{
+    return true;
+}
+
 QSet<QString> TestTreeItem::internalTargets() const
 {
     auto cppMM = CppTools::CppModelManager::instance();