Fix issue #647

Fix deserialization of @JsonUnwrapped property with object contains property with same name