Reformat using Vaadin coding conventions

Change-Id: Icc899bbfe1f75f939c10c1bc5eac44dacaed0a0d