[CDF-410] - Userid field in PersistenceEngine documents getting removed