move new moz.configure options to a more logical place

comm-central/patches/9999999-port1898060-1898177-suite-bustage.patch

@@ -42,23 +42,22 @@ diff --git a/suite/confvars.sh b/suite/confvars.sh
 diff --git a/suite/moz.configure b/suite/moz.configure
 --- a/suite/moz.configure
 +++ b/suite/moz.configure
-@@ -6,16 +6,19 @@
+@@ -3,16 +3,18 @@
+ # 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/.
  
  set_config("MOZ_SUITE", True)
  set_define("MOZ_SUITE", True)
  
  imply_option("MOZ_APP_BASENAME", "SeaMonkey")
++imply_option("MOZ_APP_ID", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}")
++imply_option("MOZ_APP_VENDOR", "Mozilla")
  
  imply_option('--enable-default-browser-agent', False)
  
-+imply_option("MOZ_APP_ID", "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}")
-+imply_option("MOZ_APP_VENDOR", "Mozilla")
-+
  @depends(target_is_windows, target_has_linux_kernel)
  def bundled_fonts(is_windows, is_linux):
      if is_windows or is_linux:
          return True
  
- 
- set_config("MOZ_BUNDLED_FONTS", bundled_fonts)
- add_old_configure_assignment("MOZ_BUNDLED_FONTS", bundled_fonts)