Merge change 840 into donut

* changes:
  TypedProperties: change the file format to be a subset of Java