various fixes for sonar issues
fix for OPENNMS-NMS-RPM-68, yet ANOTHER vaadin repository issue
Merge remote-tracking branch 'origin/master' into features/spring-3.1