Refactoring and improved fix for ERRAI-537 (MapMarshaller shouldn't introduce dep. to gwt-user)

Also configured test entity to use @JsonSerialize(using=ToStringSerializer.class) to marshall longs as strings which should always be the case when parsing JSON in the browser.
Merge branch '2.3'