Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Consistently normalize PatchSetApprovals when persisting

Nothing to merge since this method is implemented differently in 3.6+
where approvals are only persisted and not inferred.

Release-Notes: skip
Change-Id: I3c2f820a565c35eead7f07e3dcf1ec1111841840