synch up and cleanup for bug 238868 map files get overwritten
4 files changed