(Mostly) fix bug #16007 with generation of MULE-*.map files.