Fix some issues found in findBugs
Update to latest parent pom
Add findbugs annotations
Merge pull request #35 from zanata/findBugfixes

Fix some issues found in findBugs
Merge pull request #37 from zanata/parent13

Update to latest parent pom; add findbugs annotations