Remove duplicate listed map.js in fileNames array, closes #3681
Merge remote-tracking branch 'upstream/master'