Fix custom_properties diffing when config uses property_name
#978
+59
−12
property_name
#978