Merge "Use Gerrit 3.5.5 in example setup" into stable-3.5