Drupal 9 support#2

Sebastix wants to merge 2 commits intoRealityloop:8.x-1.xRealityloop/list_predefined_options:8.x-1.xfrom

Sebastix:8.x-1.xSebastix/list_predefined_options:8.x-1.xCopy head branch name to clipboard