Merge changes from topic "property-trie"

* changes:
  Have property_service create a serialized property_contexts file
  Parse property contexts via a serialized trie