synch up for bug 238868 map files get overwritten
3 files changed