Updated some comments, unit test code, and POM files to conform to
Vaadin 7 dependencies.