Merge #6880 test from 6.8; fix itself is not needed in Vaadin 7

svn changeset:25925/svn branch:6.8
svn changeset:25928/svn branch:6.8

Change-Id: I89e6f30d7d04f9511e26121f860f846bef7ec17d