Merge of a Javadoc fix to Vaadin 7.

Change-Id: I2531d7eb0394a100cbcc7661745bcbd5c41105fe
Merge "Merge of a Javadoc fix to Vaadin 7." into 7.0