Fix findbugs violations in md-sal - part 3