Backports from master
Contains patches from: !5868 (merged) !5827 (merged) !5740 (merged) !5916 (merged) !6060 (merged) !6057 (merged) !6058 (merged) !6077 (merged) (just the FindMySQL fix) !6093 (merged)
GitLab updates will be applied on October 11th, between 8am and 10am, EDT (UTC-04:00). This site may have intermittent delays during that time.
Contains patches from: !5868 (merged) !5827 (merged) !5740 (merged) !5916 (merged) !6060 (merged) !6057 (merged) !6058 (merged) !6077 (merged) (just the FindMySQL fix) !6093 (merged)