Merge branch 'stable-3.3' into master

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

Change-Id: Id1ad81d9baf076e3e306df0beb0c3b29c9b31177
diff --git a/.mailmap b/.mailmap
deleted file mode 100644
index 84de0f3..0000000
--- a/.mailmap
+++ /dev/null
@@ -1 +0,0 @@
-Hector Oswaldo Caballero <hector.caballero@ericsson.com>