Merge branch 'stable-2.11' into stable-2.12

* stable-2.11:
  Fix keyboard shortcuts for special processing of CTRL and META
  InitPlugins: Fix incorrect indentation

Change-Id: I7cd257fc0ca296a7f477e7d76884efedacf420d8

gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyCommandSet.java

@@ -136,6 +136,12 @@ public class KeyCommandSet implements KeyPressHandler {
     if (mask == 0) {
       mask = event.getNativeEvent().getKeyCode();
     }
+    if (event.isControlKeyDown()) {
+      mask |= KeyCommand.M_CTRL;
+    }
+    if (event.isMetaKeyDown()) {
+      mask |= KeyCommand.M_META;
+    }
     return mask;
   }
 }