Followup for Bug 900251 - remove check for extra channel-prefs.js and update-settings.ini files in the mar generation scripts. r=nthomas