Update mGerrit to v2.05.001

Change-Id: Ife25c157687bf7268a0ae2cc5acd5b751e324d37
Merge "Update mGerrit to v2.05.001" into jb-mr2
Merge remote-tracking branch 'cm/jb-mr2' into jb-mr2