fix compile errors
Merge branch 'vaadin-7-upgrade' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms into vaadin-7-upgrade