Can't merge patches due to unjustified findbugs failure