Issue #3375021 by slowflyer, Grevil, Anybody, tbsiqueira: Drupal 10 compatibility fixes

This is a port of the following PR !6 (merged) I did this on branch 2.0 because tag 8.x-1.4 is actually a tag from branch 2.0.x, and there is no code difference or breaking changes in between those branches.

The correct approach now is to fix this, release D10 changes on branch 2.0.x and release a new major version.