diff --git a/shared/config/checkstyle/checkstyle.xml b/shared/config/checkstyle/checkstyle.xml
index b8e9f6501bec..27ad88f091c6 100644
--- a/shared/config/checkstyle/checkstyle.xml
+++ b/shared/config/checkstyle/checkstyle.xml
@@ -25,12 +25,12 @@
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.1//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
 <module name="Checker">
 
+    <!-- See http://checkstyle.sourceforge.net/checks.html for details of the various checks -->
+
     <module name="TreeWalker">
 
         <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            General regex checks as part of the TreeWalker
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            High-priority warnings : fail the build...
         -->
         <module name="RegexpSinglelineJava">
             <property name="ignoreComments" value="true" />
@@ -38,202 +38,187 @@
             <property name="message" value="Line has leading space characters; indentation should be performed with tabs only." />
         </module>
 
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Annotation checks
-
-            See http://checkstyle.sourceforge.net/config_annotation.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
         <module name="MissingDeprecated" />
-        <module name="MissingOverride" />
-        <module name="PackageAnnotation" />
 
+        <module name="MissingOverride" />
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Block checks
+        <module name="PackageAnnotation" />
 
-            See http://checkstyle.sourceforge.net/config_blocks.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="AvoidNestedBlocks">
-            <property name="allowInSwitchCase" value="true" />
-            <property name="severity" value="warning" />
-        </module>
         <module name="NeedBraces" />
+
         <module name="LeftCurly">
             <property name="option" value="eol" />
         </module>
+
         <module name="RightCurly">
             <property name="option" value="alone" />
         </module>
 
+        <module name="EqualsHashCode" />
+
+        <module name="StringLiteralEquality" />
+
+        <module name="NoFinalizer" />
+
+        <module name="OneStatementPerLine" />
+
+        <module name="AvoidStarImport" />
+
+        <module name="RedundantImport" />
+
+        <module name="UnusedImports" />
+
+        <module name="UpperEll" />
+
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Design checks
 
-            See http://checkstyle.sourceforge.net/config_design.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        <!--
+            Medium and low priority warnings : do not fail build
         -->
-        <module name="HideUtilityClassConstructor">
-            <!-- Some classes in o.h.metamodel on master do this -->
+
+        <module name="AvoidNestedBlocks">
+            <property name="allowInSwitchCase" value="true" />
             <property name="severity" value="warning" />
         </module>
-        <module name="MutableException" />
 
+        <module name="HideUtilityClassConstructor">
+            <property name="severity" value="warning" />
+        </module>
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Coding checks
+        <module name="MutableException">
+            <property name="severity" value="warning" />
+        </module>
 
-            See http://checkstyle.sourceforge.net/config_coding.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
         <module name="EmptyStatement">
             <property name="severity" value="warning" />
         </module>
-        <module name="EqualsHashCode" />
-<!--
-        <module name="FinalLocalVariable">
+
+        <module name="MissingSwitchDefault">
             <property name="severity" value="warning" />
         </module>
--->
-        <module name="MissingSwitchDefault">
+
+        <module name="DefaultComesLast">
             <property name="severity" value="warning" />
         </module>
-        <module name="DefaultComesLast" />
+
         <module name="ModifiedControlVariable">
             <property name="severity" value="warning" />
         </module>
-        <module name="SimplifyBooleanExpression" />
-        <module name="SimplifyBooleanReturn" />
-        <module name="StringLiteralEquality" />
-        <module name="NoFinalizer" />
-        <module name="ExplicitInitialization">
+
+        <module name="SimplifyBooleanExpression">
             <property name="severity" value="warning" />
         </module>
-        <module name="FallThrough" />
-        <module name="OneStatementPerLine" />
 
+        <module name="SimplifyBooleanReturn">
+            <property name="severity" value="warning" />
+        </module>
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Import checks
-
-            See http://checkstyle.sourceforge.net/config_imports.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="AvoidStarImport" />
-        <module name="RedundantImport" />
-        <module name="UnusedImports" />
-
+        <module name="ExplicitInitialization">
+            <property name="severity" value="warning" />
+        </module>
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Misc checks
+        <module name="FallThrough">
+            <property name="severity" value="warning" />
+        </module>
 
-            See http://checkstyle.sourceforge.net/config_misc.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="UpperEll" />
         <module name="ArrayTypeStyle">
-            <!-- Some classes in o.h.metamodel on master do this -->
             <property name="severity" value="warning" />
         </module>
+
         <module name="TrailingComment">
             <property name="severity" value="warning" />
         </module>
 
+        <module name="ModifierOrder">
+            <property name="severity" value="warning" />
+        </module>
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Modifier checks
-
-            See http://checkstyle.sourceforge.net/config_modifier.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="ModifierOrder"/>
-
-
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Naming checks
-
-            See http://checkstyle.sourceforge.net/config_naming.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
         <module name="AbstractClassName">
             <!-- we are just using this to make sure that classes matching the pattern (Abstract*) have the abstract modifier -->
             <property name="format" value="^Abstract.*$" />
             <property name="ignoreName" value="true" />
+            <property name="severity" value="warning" />
         </module>
+
         <module name="ClassTypeParameterName">
             <property name="format" value="^[A-Z][A-Z0-9]*$" />
+            <property name="severity" value="warning" />
         </module>
+
         <module name="ConstantName">
             <property name="format" value="^[A-Z](_?[A-Z0-9]+)*$|log" />
-            <!-- Some classes in o.h.metamodel on master violate this -->
             <property name="severity" value="warning" />
         </module>
-        <module name="LocalFinalVariableName" />
+
+        <module name="LocalFinalVariableName">
+            <property name="severity" value="warning" />
+        </module>
+
         <module name="LocalVariableName">
-            <!-- Some classes in o.h.metamodel on master violate this -->
             <property name="severity" value="warning" />
         </module>
-        <module name="MemberName" />
-        <!--
-        The org.hibernate.engine.spi.ManagedEntity method names (prefixed with '&&_') muck with this
-        <module name="MethodName" />
-        -->
+
+        <module name="MemberName">
+            <property name="severity" value="warning" />
+        </module>
+
         <module name="MethodTypeParameterName">
             <property name="format" value="^[A-Z][A-Z0-9]*$" />
+            <property name="severity" value="warning" />
         </module>
-        <module name="PackageName" />
-        <module name="ParameterName" />
-        <module name="StaticVariableName" />
-        <module name="TypeName" />
 
+        <module name="PackageName">
+            <property name="severity" value="warning" />
+        </module>
 
-        <!--
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-            Whitespace checks
+        <module name="ParameterName">
+            <property name="severity" value="warning" />
+        </module>
+
+        <module name="StaticVariableName">
+            <property name="severity" value="warning" />
+        </module>
+
+        <module name="TypeName">
+            <property name="severity" value="warning" />
+        </module>
+
+        <module name="AbbreviationAsWordInName">
+            <property name="severity" value="warning" />
+            <property name="ignoreOverriddenMethod" value="true" />
+        </module>
+
+        <module name="MethodParamPad">
+            <property name="severity" value="warning" />
+        </module>
+
+        <module name="TypecastParenPad">
+            <property name="severity" value="warning" />
+        </module>
 
-            See http://checkstyle.sourceforge.net/config_whitespace.html
-            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        -->
-        <module name="MethodParamPad" />
-        <module name="TypecastParenPad" />
         <module name="ParenPad">
             <property name="tokens" value="CTOR_CALL, METHOD_CALL, SUPER_CTOR_CALL" />
             <property name="option" value="space" />
+            <property name="severity" value="warning" />
         </module>
 
     </module>
 
-
-    <!--
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        Javadoc checks
-
-        See http://checkstyle.sourceforge.net/config_javadoc.html
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    -->
-<!--
     <module name="JavadocPackage">
         <property name="allowLegacy" value="true" />
+        <property name="severity" value="warning" />
     </module>
--->
 
-    <!--
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        Misc checks
+    <module name="NewlineAtEndOfFile" />
 
-        See http://checkstyle.sourceforge.net/config_misc.html
-        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    <!--
+        Used to collect "todo" comments into a single location
     -->
-    <module name="NewlineAtEndOfFile" />
+    <module name="TreeWalker">
+        <module name="TodoComment">
+            <property name="format" value="[Tt][Oo][Dd][Oo]"/>
+            <property name="severity" value="info" />
+        </module>
+    </module>
 
 </module>