Merge "Fix raw Class in sal-distributed-datastore messages"