Backing out duplicate findbugs (#86)
Merge branch '2.2'