Merge branch 'stable-3.3' into master

* stable-3.3:
  Remove no longer applicable .mailmap file contents

Change-Id: Id1ad81d9baf076e3e306df0beb0c3b29c9b31177