HHH-3868 Fix null pointer exception on merge of entity with transient component