Fixes disabled properties and fixes property order

Option "no_additional_properties" is still behaving strange #209 —
allows initial properties to be re-added.

Maintain propertyOrder when using Object Properties #197
— uses already included property_order array