Merge remote-tracking branch 'origin/3.5'

Change-Id: I55acdb9ad3d475ceb09c172555445d2da756c9d6

plugins/autotest/testsettingspage.cpp

@@ -91,7 +91,7 @@ TestSettings TestSettingsWidget::settings() const
 TestSettingsPage::TestSettingsPage(const QSharedPointer<TestSettings> &settings)
     : m_settings(settings), m_widget(0)
 {
-    setId("A.General");
+    setId("A.AutoTest.General");
     setDisplayName(tr("General"));
     setCategory(Constants::AUTOTEST_SETTINGS_CATEGORY);
     setDisplayCategory(tr("Test Settings"));