Bug 451676 - fixes and clean-ups using FindBugs analysis

Change-Id: I0689c1884decb5ad25e4388eacd21fe99a0a44f8
Signed-off-by: Thierry BLIND <thierryblind@msn.com>