Fix CI on 1.14.x branch
Backport of !286 (merged) and !338 (merged) to 1.14.x, so we can have working CI there. No non-CI changes.
Edited by Simon McVittie
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
Backport of !286 (merged) and !338 (merged) to 1.14.x, so we can have working CI there. No non-CI changes.