--- build/autoconf/nspr-build.m4
+++ build/autoconf/nspr-build.m4
@@ -102,12 +102,6 @@
    fi
 fi
 
-if test -z "$nspr_opts" || test "$nspr_opts" = x; then
-    AC_MSG_RESULT($which_nspr)
-else
-    AC_MSG_ERROR([only one way of using NSPR may be selected. See 'configure --help'.])
-fi
-
 AC_SUBST(MOZ_BUILD_NSPR)
 
 if test "$MOZ_BUILD_APP" = js; then
--- build/moz.configure/init.configure
+++ build/moz.configure/init.configure
@@ -637,15 +637,6 @@
         base_dir = os.path.join(base_dir, external_source_dir[0])
 
     build_app = project[0]
-
-    if not external_source_dir and build_app not in ('xulrunner', 'js'):
-        if noncomm_build:
-            log.info("=====WARNING WARNING WARNING=====")
-            log.info("UNSUPPORTED NONCOMM-BUILD: Application code SHOULD NOT be put inside the platform tree, and doing so may have unforseen consequences if/when platform code is changed.")
-            log.info("=====WARNING WARNING WARNING=====")
-        else:
-            die('Cannot find project %s', build_app)
-
     build_app_abspath = os.path.join(base_dir, build_app)
 
     if exists(build_app_abspath):
--- python/mozbuild/mozpack/executables.py
+++ python/mozbuild/mozpack/executables.py
@@ -93,7 +93,7 @@
     Execute the STRIP command with STRIP_FLAGS on the given path.
     '''
     from buildconfig import substs
-    strip = substs['STRIP']
+    strip = "strip"
     flags = substs['STRIP_FLAGS'].split() if 'STRIP_FLAGS' in substs else []
     cmd = [strip] + flags + [path]
     if subprocess.call(cmd) != 0:
--- python/mozbuild/mozpack/manifests.py
+++ python/mozbuild/mozpack/manifests.py
@@ -324,9 +324,8 @@
         ))
 
     def _add_entry(self, dest, entry):
-        if dest in self._dests:
-            raise ValueError('Item already in manifest: %s' % dest)
-
+#       if dest in self._dests:
+#           raise ValueError('Item already in manifest: %s' % dest)
         self._dests[dest] = entry
 
     def populate_registry(self, registry, defines_override={}):
--- security/nss/lib/certhigh/certvfy.c
+++ security/nss/lib/certhigh/certvfy.c
@@ -1,6 +1,9 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include <nss.h>
+
 #include "nspr.h"
 #include "secerr.h"
 #include "secport.h"
--- toolkit/locales/en-US/chrome/global/aboutSupport.dtd
+++ toolkit/locales/en-US/chrome/global/aboutSupport.dtd
@@ -7,8 +7,7 @@
 <!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
 <!ENTITY aboutSupport.pageSubtitle "
   This page contains technical information that might be useful when you’re
-  trying to solve a problem. If you are looking for answers to common questions
-  about &brandShortName;, check out our <a id='supportLink'>support website</a>.
+  trying to solve a problem.
 ">
 
 <!ENTITY aboutSupport.crashes.title "Crash Reports">
--- toolkit/mozapps/extensions/content/extensions.xul
+++ toolkit/mozapps/extensions/content/extensions.xul
@@ -193,10 +193,6 @@
                     class="category"
                     name="&view.search.label;" priority="0"
                     tooltiptext="&view.search.label;" disabled="true"/>
-      <richlistitem id="category-discover" value="addons://discover/"
-                    class="category"
-                    name="&view.discover.label;" priority="1000"
-                    tooltiptext="&view.discover.label;"/>
       <richlistitem id="category-availableUpdates" value="addons://updates/available"
                     class="category"
                     name="&view.availableUpdates.label;" priority="100000"
@@ -301,18 +297,6 @@
             </hbox>
             <spacer class="alert-spacer-after"/>
           </vbox>
-          <vbox id="search-list-empty" class="alert-container"
-                flex="1" hidden="true">
-            <spacer class="alert-spacer-before"/>
-            <vbox class="alert">
-              <label value="&listEmpty.search.label;"/>
-              <button class="discover-button"
-                      id="discover-button-search"
-                      label="&listEmpty.button.label;"
-                      command="cmd_goToDiscoverPane"/>
-            </vbox>
-            <spacer class="alert-spacer-after"/>
-          </vbox>
           <richlistbox id="search-list" class="list" flex="1">
             <hbox pack="center">
               <label id="search-allresults-link" class="text-link"/>
--- config/makefiles/autotargets.mk
+++ config/makefiles/autotargets.mk
@@ -60,7 +60,11 @@
 # Make the timestamp old enough for not being a problem with symbolic links
 # targets depending on it. Use Jan 3, 1980 to accomodate any timezone where
 # 198001010000 would translate to something older than FAT epoch.
-	@$(TOUCH) -t 198001030000 '$@'
+	pwd
+	rm -fr '$@'
+	mkdir -p '$@'
+	rm -fr '$@'
+	$(TOUCH) -t 198001030000 '$@' || true
 
 # A handful of makefiles are attempting "mkdir dot".
 # tbpl/valgrind builds are using this target