Merge of (#9940) to Vaadin 7

Change-Id: Ie2e53c8cdba20c8265fa04e35e9469b39b21d43e