WELD-942: Last normal findbugs bugs suppressed/fixed