SONARFBUGS-4 Merge fb-contrib into findbugs