property: correctly set the has optional flag when merging property lists