Merge "Parser: Make makeKnownLinkHolder() protected, and remove $query handling"