CM: Update contributors

Change-Id: I13c29034f4e2dbe9a7a93ef40396fbced85556be
prepare for switch to new superuser

Change-Id: I69c992928e6552a76ba880a399d08e4f59d348e3
Merge remote-tracking branch 'upstream/cm-10.1' into HEAD