Issue #2322059 by rpayanm, claudiu.cristea, ravi.khetri, sarhugo, undertext, Ashok Negi, adci_contributor, griffynh, tibbsa, jibran, neclimdul, Berdir: Keep the UrlHelper::buildQuery method and remove @todo

Issue #2358991 by JeroenT, ianthomas_uk, rpayanm, jamesdixon, er.pushpinderrana, Ashok Negi: Remove usage of drupal_mail()