Updated to build against HC 4.0.4

fixes vaadin cantfix issue 14569, only fixed for v7 version

Change-Id: Ib15123b9abe6cef39822eb385a11eb9c158ac907