Fixes to make the plugin work with Vaadin 7.1.8 and Liferay 6.2.0-GA1

This pull request contains fixes that make it possible to run the plugin with Vaadin 7.1.8 on Liferay 6.2.