Merge of (#10776) test to Vaadin 7.

Change-Id: I05d66505ecc9d413ae34c0ae5e2fa735764d4fee
Merge "Merge of (#10776) test to Vaadin 7." into 7.0