EXP-26. Fixes EntityId's toJavaEntityId method.