CE upstream

Closed Nick Thomas requested to merge 1165-jej-remote-mirror-validation-failures into master

This is a test