Fix findubugs warnings in aura-impl/src
@rev eric.anderson@@
@bug W-2102990@
@bug W-2105639@
Merging origin/amcculloch/master-pending/findbugs2 into master