Merge pull request #481 from pkediyal/schema_versioning_final

M156: remove incorrect check for None values
M156: move persisted_version update to datastore's deserialization