Merge "Fix xenial-debmirror mirror"