Allow publish_properties and publish_fields to be delivered in any order.
Merge bug25934
stable to default