Merge pull request #743 from apache/feature/685-properties-json-serialization

Feature/685 properties json serialization