fix findbugs errors
@rev goliver@
@BUG W-2105582@
Merging origin/amcculloch/master-pending/findbugs into master