Merge of (#10609) to Vaadin 7.

Automated test for #9986.

Change-Id: I3ce8b61ac7efd8eaa7a1b16e786ce7c2edbad0a9
Merge "Merge of (#10609) to Vaadin 7." into 7.0