EXP-25. Fixes EntityId's toJavaEntityId method.