code cleanup, fix some PMD and FindBugs warnings, update changelog from release
Authored by: mrieser 2012-03-27
Parent: [r18880]
Child: [r18882]