Drupal 11 compatibility

Created an MR and attached a patch (same thing) with necessary changes for Upgrade Status to be happy.

You need the D10 compatibility patch as well, from #3289374

Combined D10 compatibility patch (from 3289374 📌 Automated Drupal 10 compatibility fixes RTBC ) with D11 patch from here. I'm not having any issues with this solution.

I merged the MR from the D10 update (6) into 7 and resolved the conflict.

This will allow everyone who contributed to them to maintain their commit authorship, as well as eliminate the need to install two conflicting patches.