Merge "app/gerrit: fix advertised address"