Merge branch 'stable-3.7'

[c4c52fd] Inline removal of Gerrit.Nav in Gerrit 3.7

Change-Id: I2a1d11726252ff5da62f9250fdcb86584301c95b