Merge branch 'tests-gettext-macros-require' into maint * tests-gettext-macros-require: tests: fix handling of gettext macros requirement