Integrate in the javaApi additions with some generics reworking and some
classes removed after sanity-checks done more in-depth.