Index: trunk/tools/pmd/josm-ruleset.xml
===================================================================
--- trunk/tools/pmd/josm-ruleset.xml	(revision 18332)
+++ trunk/tools/pmd/josm-ruleset.xml	(revision 18514)
@@ -57,4 +57,6 @@
     <exclude name="ControlStatementBraces"/>
     <exclude name="DefaultPackage"/>
+    <!-- EmptyControlStatement is not configurable, so the behavior of the old excludes of EmptyIfStmt/EmptyWhileStmt (errorprone.xml) while getting new functionality cannot be done -->
+    <exclude name="EmptyControlStatement"/>
     <exclude name="EmptyMethodInAbstractClassShouldBeAbstract"/>
     <exclude name="FieldDeclarationsShouldBeAtStartOfClass"/>
@@ -175,6 +177,4 @@
     <exclude name="DoNotTerminateVM"/>
     <exclude name="DontImportSun"/>
-    <exclude name="EmptyIfStmt"/>
-    <exclude name="EmptyWhileStmt"/>
     <exclude name="ImplicitSwitchFallThrough"/>
     <exclude name="MissingSerialVersionUID"/>