small bugfixes related to vaadin7 mostly
optimization re
Merge branch 'patch42_141117' into uima