AAD-105: missing geomajas classes (TODO: merge fixes)