Bug 1333443 - 52.0b1 is busted due to migration bug, r=rail

this is to fix the migration configs themselves. I've left aurora_to_beta.py
without osx-universal because on our next migration, beta won't have
osx-universal anymore.

This patch is needed because it breaks the sanity checking since this line:
https://hg.mozilla.org/mozilla-central/rev/f82cd0199ab7#l10.16 is effectively
duplicating this one:
https://dxr.mozilla.org/mozilla-central/rev/8ff550409e1d1f8b54f6f7f115545dbef857be0b/testing/mozharness/configs/merge_day/aurora_to_beta.py#29

MozReview-Commit-ID: 3jNnB8yPMSJ

--HG--
extra : rebase_source : 290267b216e83b9ebbaacbbf562533a2dbfc6faa
extra : amend_source : d4140a2f5af00cff26776a19b0ad532e54e369b9

testing/mozharness/configs/merge_day/aurora_to_beta.py

@@ -38,9 +38,6 @@ config = {
                   "browser/config/mozconfigs/win64/l10n-mozconfig",
                   "browser/config/mozconfigs/macosx64/l10n-mozconfig"]
     ] + [
-        ("browser/config/mozconfigs/macosx64/nightly",
-         "ac_add_options --with-branding=browser/branding/aurora",
-         "ac_add_options --with-branding=browser/branding/nightly"),
         ("browser/confvars.sh",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora",
          "ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release"),

testing/mozharness/configs/merge_day/central_to_aurora.py

@@ -52,12 +52,6 @@ config = {
         ("browser/confvars.sh",
          "MAR_CHANNEL_ID=firefox-mozilla-central",
          "MAR_CHANNEL_ID=firefox-mozilla-aurora"),
-        ("browser/config/mozconfigs/macosx64/nightly",
-         "ac_add_options --with-branding=browser/branding/nightly",
-         "ac_add_options --with-branding=browser/branding/aurora"),
-        ("browser/config/mozconfigs/macosx64/l10n-mozconfig",
-         "ac_add_options --with-branding=browser/branding/nightly",
-         "ac_add_options --with-branding=browser/branding/aurora"),
         ("browser/config/mozconfigs/whitelist",
          "ac_add_options --with-branding=browser/branding/nightly",
          "ac_add_options --with-branding=browser/branding/aurora"),