Merge remote-tracking branch 'origin/4.8'

Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5

src/plugins/coreplugin/actionmanager/actioncontainer.cpp

@@ -388,6 +388,7 @@ MenuActionContainer::MenuActionContainer(Id id)
       m_menu(new QMenu)
 {
     m_menu->setObjectName(id.toString());
+    m_menu->menuAction()->setMenuRole(QAction::NoRole);
     setOnAllDisabledBehavior(Disable);
 }