Merge with forked cloud-odata-java repo