Merge branch 'ce-port-3959-mirroring-interface-improvements' of...

Merge branch 'ce-port-3959-mirroring-interface-improvements' of https://gitlab.com/gitlab-org/gitlab-ce into ce-port-3959-mirroring-interface-improvements