Merge "BUG-8607: Fix issues in checkstyle enforcement for module bulk-o-matic"