fixup for ifdef name confusion in 1f245437
Fix libgdmaps testsuite breakage from ae603f03
Merge branch '2.x' into systemd