Update mGerrit to v2.04.010

Change-Id: I95f4fecd1933a6971c45fe825d033d9b60cd82fc
Merge remote-tracking branch 'cm/jb-mr2' into jb-mr2