[JBTM-2028] minor findbugs warnings