Bug 1346897 - Indent tooltool manifests. r=mshal
authorRalph Giles <giles@mozilla.com>
Wed, 15 Mar 2017 12:27:51 -0700
changeset 398332 faf87c0a0f98f6b44b63be320e05276e149c7403
parent 398331 2cac3caad0fa31480156097f51ba321189f261aa
child 398333 01772e6e073a010b0bd3ff47403717bde9c9b728
push id1490
push usermtabara@mozilla.com
push dateMon, 31 Jul 2017 14:08:16 +0000
treeherdermozilla-release@70e32e6bf15e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1346897, 1325225
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1346897 - Indent tooltool manifests. r=mshal Apply a 2-character indent to in-tree tooltool manifests to make them easier to read, and to make the formatting more consistent so automating updates is simpler. Modern editors will maintain json indentation. The only long lines we have are already over 80 characters, so the extra space shouldn't create new long lines. Also update mercurial installer script to generate json with the same indentation, even though its output is temporary. Tooltool itself was updated to generate manifests with this indentation in Bug 1325225. MozReview-Commit-ID: DKj6nL9OENv
b2g/config/aries/releng-aries.manifest
b2g/config/nexus-5-l/releng-nexus5.manifest
b2g/config/tooltool-manifests/linux32/releng.manifest
b2g/config/tooltool-manifests/macosx64/releng.manifest
b2g/config/tooltool-manifests/win32/releng.manifest
b2g/dev/config/tooltool-manifests/linux64/hazard.manifest
b2g/dev/config/tooltool-manifests/linux64/releng.manifest
b2g/dev/config/tooltool-manifests/macosx64/releng.manifest
b2g/dev/config/tooltool-manifests/win32/releng.manifest
b2g/test/emulator.manifest
browser/config/tooltool-manifests/linux32/releng.manifest
browser/config/tooltool-manifests/linux64/asan.manifest
browser/config/tooltool-manifests/linux64/clang.manifest
browser/config/tooltool-manifests/linux64/clang.manifest.centos6
browser/config/tooltool-manifests/linux64/hazard.manifest
browser/config/tooltool-manifests/linux64/msan.manifest
browser/config/tooltool-manifests/linux64/releng.manifest
browser/config/tooltool-manifests/linux64/tsan.manifest
browser/config/tooltool-manifests/macosx64/asan.manifest
browser/config/tooltool-manifests/macosx64/clang.manifest
browser/config/tooltool-manifests/macosx64/cross-clang.manifest
browser/config/tooltool-manifests/macosx64/cross-releng.manifest
browser/config/tooltool-manifests/macosx64/releng.manifest
browser/config/tooltool-manifests/win32/build-clang-cl.manifest
browser/config/tooltool-manifests/win32/clang.manifest
browser/config/tooltool-manifests/win32/l10n.manifest
browser/config/tooltool-manifests/win32/releng.manifest
browser/config/tooltool-manifests/win64/clang.manifest
browser/config/tooltool-manifests/win64/l10n.manifest
browser/config/tooltool-manifests/win64/releng.manifest
js/src/devtools/rootAnalysis/build/gcc-b2g.manifest
js/src/devtools/rootAnalysis/build/gcc.manifest
mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest
mobile/android/config/tooltool-manifests/android-x86/releng.manifest
mobile/android/config/tooltool-manifests/android/releng.manifest
taskcluster/docker/recipes/install-mercurial.sh
testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest
testing/config/tooltool-manifests/androidarm_4_3/releng.manifest
testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest
testing/config/tooltool-manifests/androidx86/mach-emulator.manifest
testing/config/tooltool-manifests/androidx86/releng.manifest
testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest
testing/config/tooltool-manifests/linux32/hostutils.manifest
testing/config/tooltool-manifests/linux32/jimdb-arm-pie.manifest
testing/config/tooltool-manifests/linux32/jimdb-arm.manifest
testing/config/tooltool-manifests/linux32/jimdb-x86-pie.manifest
testing/config/tooltool-manifests/linux32/jimdb-x86.manifest
testing/config/tooltool-manifests/linux32/nodejs.manifest
testing/config/tooltool-manifests/linux32/releng.manifest
testing/config/tooltool-manifests/linux64/hostutils.manifest
testing/config/tooltool-manifests/linux64/jimdb-arm-pie.manifest
testing/config/tooltool-manifests/linux64/jimdb-arm.manifest
testing/config/tooltool-manifests/linux64/jimdb-x86-pie.manifest
testing/config/tooltool-manifests/linux64/jimdb-x86.manifest
testing/config/tooltool-manifests/linux64/nodejs.manifest
testing/config/tooltool-manifests/linux64/releng.manifest
testing/config/tooltool-manifests/macosx64/hostutils.manifest
testing/config/tooltool-manifests/macosx64/jimdb-arm-pie.manifest
testing/config/tooltool-manifests/macosx64/jimdb-arm.manifest
testing/config/tooltool-manifests/macosx64/jimdb-x86-pie.manifest
testing/config/tooltool-manifests/macosx64/jimdb-x86.manifest
testing/config/tooltool-manifests/macosx64/nodejs.manifest
testing/config/tooltool-manifests/macosx64/releng.manifest
testing/config/tooltool-manifests/win32/nodejs.manifest
testing/config/tooltool-manifests/win32/releng.manifest
--- a/b2g/config/aries/releng-aries.manifest
+++ b/b2g/config/aries/releng-aries.manifest
@@ -1,27 +1,27 @@
 [
-{
-"version": "Android NDK r11b for B2G",
-"algorithm": "sha512",
-"visibility": "internal",
-"filename": "android-ndk-b2g.tar.xz",
-"unpack": true,
-"digest": "bc37c6b2e38f4ff19e3326786312d8f893600e155d35dfba45163bd909e022db852b9c6920863cb498bbe7da8b86a6a387fa024bc9444ce3a8d1715cf2c24b21",
-"size": 292442020
-},
-{
-"algorithm": "sha512",
-"visibility": "internal",
-"filename": "backup-aries_23.0.1.A.5.77.tar.xz",
-"unpack": true,
-"digest": "79c8e390e88cc4765ff7f5f29f3d5337c9037b7eb9414006947d38d34acefdbcf7090c18a366948c682b1c2c9d9ef51012e7be44daa28fdde7b837ade647c257",
-"size": 227555180
-},
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": "True"
-}
+  {
+    "version": "Android NDK r11b for B2G",
+    "algorithm": "sha512",
+    "visibility": "internal",
+    "filename": "android-ndk-b2g.tar.xz",
+    "unpack": true,
+    "digest": "bc37c6b2e38f4ff19e3326786312d8f893600e155d35dfba45163bd909e022db852b9c6920863cb498bbe7da8b86a6a387fa024bc9444ce3a8d1715cf2c24b21",
+    "size": 292442020
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "internal",
+    "filename": "backup-aries_23.0.1.A.5.77.tar.xz",
+    "unpack": true,
+    "digest": "79c8e390e88cc4765ff7f5f29f3d5337c9037b7eb9414006947d38d34acefdbcf7090c18a366948c682b1c2c9d9ef51012e7be44daa28fdde7b837ade647c257",
+    "size": 227555180
+  },
+  {
+    "version": "gcc 4.8.5 + PR64905",
+    "size": 80160264,
+    "digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": "True"
+  }
 ]
--- a/b2g/config/nexus-5-l/releng-nexus5.manifest
+++ b/b2g/config/nexus-5-l/releng-nexus5.manifest
@@ -1,19 +1,19 @@
 [
-{
-"version": "Android NDK r11b for B2G",
-"algorithm": "sha512",
-"visibility": "internal",
-"filename": "android-ndk-b2g.tar.xz",
-"unpack": true,
-"digest": "bc37c6b2e38f4ff19e3326786312d8f893600e155d35dfba45163bd909e022db852b9c6920863cb498bbe7da8b86a6a387fa024bc9444ce3a8d1715cf2c24b21",
-"size": 292442020
-},
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": "True"
-}
+  {
+    "version": "Android NDK r11b for B2G",
+    "algorithm": "sha512",
+    "visibility": "internal",
+    "filename": "android-ndk-b2g.tar.xz",
+    "unpack": true,
+    "digest": "bc37c6b2e38f4ff19e3326786312d8f893600e155d35dfba45163bd909e022db852b9c6920863cb498bbe7da8b86a6a387fa024bc9444ce3a8d1715cf2c24b21",
+    "size": 292442020
+  },
+  {
+    "version": "gcc 4.8.5 + PR64905",
+    "size": 80160264,
+    "digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": "True"
+  }
 ]
--- a/b2g/config/tooltool-manifests/linux32/releng.manifest
+++ b/b2g/config/tooltool-manifests/linux32/releng.manifest
@@ -1,32 +1,32 @@
 [
-{
-"version": "gcc 4.8.5 + PR64905",
-"size": 80160264,
-"digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 11189216,
-"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"size": 31078810,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"algorithm": "sha512",
-"filename": "moz-tt.tar.bz2",
-"unpack": true
-}
+  {
+    "version": "gcc 4.8.5 + PR64905",
+    "size": 80160264,
+    "digest": "c1a9dc9da289b8528874d16300b9d13a997cec99195bb0bc46ff665216d8535d6d6cb5af6b4b1f2749af6815dab12e703fdb3849014e5c23a70eff351a0baf4e",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 11189216,
+    "digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  },
+  {
+    "size": 167175,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 31078810,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "algorithm": "sha512",
+    "filename": "moz-tt.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/b2g/config/tooltool-manifests/macosx64/releng.manifest
+++ b/b2g/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,24 +1,24 @@
 [
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"size": 31078810,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"algorithm": "sha512",
-"filename": "moz-tt.tar.bz2",
-"unpack": true
-}
+  {
+    "version": "clang 3.8.0",
+    "size": 133060926,
+    "digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 167175,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 31078810,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "algorithm": "sha512",
+    "filename": "moz-tt.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/b2g/config/tooltool-manifests/win32/releng.manifest
+++ b/b2g/config/tooltool-manifests/win32/releng.manifest
@@ -1,22 +1,22 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"size": 31078810,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"algorithm": "sha512",
-"filename": "moz-tt.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "size": 31078810,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "algorithm": "sha512",
+    "filename": "moz-tt.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 167175,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest
+++ b/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest
@@ -1,48 +1,48 @@
 [
-{
-"size": 102421980,
-"digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
-"version": "gcc 4.9.3",
-"unpack": true,
-"filename": "gcc.tar.xz",
-"algorithm": "sha512"
-},
-{
-"unpack": true,
-"algorithm": "sha512",
-"filename": "sixgill.tar.xz",
-"hg_id": "8cb9c3fb039a+ tip",
-"digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
-"size": 2631908
-},
-{
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"size": 12072532
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"size": 167175
-},
-{
-"filename": "moz-tt.tar.bz2",
-"algorithm": "sha512",
-"unpack": true,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"size": 31078810
-}
+  {
+    "size": 102421980,
+    "digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
+    "version": "gcc 4.9.3",
+    "unpack": true,
+    "filename": "gcc.tar.xz",
+    "algorithm": "sha512"
+  },
+  {
+    "unpack": true,
+    "algorithm": "sha512",
+    "filename": "sixgill.tar.xz",
+    "hg_id": "8cb9c3fb039a+ tip",
+    "digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
+    "size": 2631908
+  },
+  {
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "size": 12072532
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "size": 167175
+  },
+  {
+    "filename": "moz-tt.tar.bz2",
+    "algorithm": "sha512",
+    "unpack": true,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "size": 31078810
+  }
 ]
--- a/b2g/dev/config/tooltool-manifests/linux64/releng.manifest
+++ b/b2g/dev/config/tooltool-manifests/linux64/releng.manifest
@@ -1,40 +1,40 @@
 [
-{
-"version": "gcc 4.9.3",
-"size": 102421980,
-"digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"size": 31078810,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"algorithm": "sha512",
-"filename": "moz-tt.tar.bz2",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.3",
+    "size": 102421980,
+    "digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 167175,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 31078810,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "algorithm": "sha512",
+    "filename": "moz-tt.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/b2g/dev/config/tooltool-manifests/macosx64/releng.manifest
+++ b/b2g/dev/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,24 +1,24 @@
 [
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"size": 31078810,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"algorithm": "sha512",
-"filename": "moz-tt.tar.bz2",
-"unpack": true
-}
+  {
+    "version": "clang 3.8.0",
+    "size": 133060926,
+    "digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 167175,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 31078810,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "algorithm": "sha512",
+    "filename": "moz-tt.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/b2g/dev/config/tooltool-manifests/win32/releng.manifest
+++ b/b2g/dev/config/tooltool-manifests/win32/releng.manifest
@@ -1,22 +1,22 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"size": 167175,
-"digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
-"algorithm": "sha512",
-"filename": "sccache.tar.bz2",
-"unpack": true
-},
-{
-"size": 31078810,
-"digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
-"algorithm": "sha512",
-"filename": "moz-tt.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "size": 167175,
+    "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
+    "algorithm": "sha512",
+    "filename": "sccache.tar.bz2",
+    "unpack": true
+  },
+  {
+    "size": 31078810,
+    "digest": "2dffe4e5419a0c0c9908dc52b01cc07379a42e2aa8481be7a26bb8750b586b95bbac3fe57e64f5d37b43e206516ea70ad938a2e45858fdcf1e28258e70ae8d8c",
+    "algorithm": "sha512",
+    "filename": "moz-tt.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/b2g/test/emulator.manifest
+++ b/b2g/test/emulator.manifest
@@ -1,6 +1,8 @@
-[{
-"size": 746441603,
-"digest": "199236aefecc1657cdc1b791ec38c8184557ab9249aff9c63a74abf73edc1dc0ea36b19b558f34ca3b14f8a511b10bcf37408b19701929522b4dc22dbaddcbe9",
-"algorithm": "sha512",
-"filename": "emulator.zip"
-}]
+[
+  {
+    "size": 746441603,
+    "digest": "199236aefecc1657cdc1b791ec38c8184557ab9249aff9c63a74abf73edc1dc0ea36b19b558f34ca3b14f8a511b10bcf37408b19701929522b4dc22dbaddcbe9",
+    "algorithm": "sha512",
+    "filename": "emulator.zip"
+  }
+]
--- a/browser/config/tooltool-manifests/linux32/releng.manifest
+++ b/browser/config/tooltool-manifests/linux32/releng.manifest
@@ -1,35 +1,35 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 11189216,
-"digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 11189216,
+    "digest": "18bc52b0599b1308b667e282abb45f47597bfc98a5140cfcab8da71dacf89dd76d0dee22a04ce26fe7ad1f04e2d6596991f9e5b01fd2aaaab5542965f596b0e6",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/asan.manifest
+++ b/browser/config/tooltool-manifests/linux64/asan.manifest
@@ -1,34 +1,34 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"version": "clang 3.9.0, libgcc 4.9.4",
-"size": 166261192,
-"digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "clang 3.9.0, libgcc 4.9.4",
+    "size": 166261192,
+    "digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/clang.manifest
+++ b/browser/config/tooltool-manifests/linux64/clang.manifest
@@ -1,35 +1,35 @@
 [
-{
-"version": "clang 3.8.0, libgcc 4.8.5",
-"size": 140319580,
-"digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
+  {
+    "version": "clang 3.8.0, libgcc 4.8.5",
+    "size": 140319580,
+    "digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/clang.manifest.centos6
+++ b/browser/config/tooltool-manifests/linux64/clang.manifest.centos6
@@ -1,34 +1,34 @@
 [
-{
-"version": "clang 3.8.0, libgcc 4.8.5",
-"size": 140319580,
-"digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
+  {
+    "version": "clang 3.8.0, libgcc 4.8.5",
+    "size": 140319580,
+    "digest": "34e219d7e8eaffa81710631c34d21355563d06335b3c00851e94c1f42f9098788fded8463dd0f67dd699f77b47a0245dd7aff754943a7a03fb5fd145a808254f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/hazard.manifest
+++ b/browser/config/tooltool-manifests/linux64/hazard.manifest
@@ -1,43 +1,43 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
-"unpack": true,
-"algorithm": "sha512",
-"filename": "sixgill.tar.xz",
-"size": 2631908,
-"hg_id": "8cb9c3fb039a+ tip"
-},
-{
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"unpack": true,
-"setup": "setup.sh",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"size": 12072532
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "digest": "36dc644e24c0aa824975ad8f5c15714445d5cb064d823000c3cb637e885199414d7df551e6b99233f0656dcf5760918192ef04113c486af37f3c489bb93ad029",
+    "unpack": true,
+    "algorithm": "sha512",
+    "filename": "sixgill.tar.xz",
+    "size": 2631908,
+    "hg_id": "8cb9c3fb039a+ tip"
+  },
+  {
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "unpack": true,
+    "setup": "setup.sh",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "size": 12072532
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/msan.manifest
+++ b/browser/config/tooltool-manifests/linux64/msan.manifest
@@ -1,34 +1,34 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"version": "clang 3.9.0, libgcc 4.9.4",
-"size": 166261192,
-"digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "clang 3.9.0, libgcc 4.9.4",
+    "size": 166261192,
+    "digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/releng.manifest
+++ b/browser/config/tooltool-manifests/linux64/releng.manifest
@@ -1,43 +1,43 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 110077036,
-"digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"version": "clang + llvm 3.9.0, built from SVN r290136",
-"size": 151724092,
-"digest": "4ab5ff2131e4ce4888d38c17feb192c19bc6ede83abef55af7d2f29e2446f6335dc860377fa25cbb0283b3958c0a3d377a3cfdc7705a85d4843e3ab357ddca7f",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 110077036,
+    "digest": "8b99d058cc081f6ca2a3cc88c3ca9c15232961d2539774dacee35e2258955ad8fc4cb0af3b903a3e3f8a264ddecb3baae9256502ffc178a2823779284ace2bd8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  },
+  {
+    "version": "clang + llvm 3.9.0, built from SVN r290136",
+    "size": 151724092,
+    "digest": "4ab5ff2131e4ce4888d38c17feb192c19bc6ede83abef55af7d2f29e2446f6335dc860377fa25cbb0283b3958c0a3d377a3cfdc7705a85d4843e3ab357ddca7f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/linux64/tsan.manifest
+++ b/browser/config/tooltool-manifests/linux64/tsan.manifest
@@ -1,26 +1,26 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"version": "clang 3.9.0, libgcc 4.9.4",
-"size": 166261192,
-"digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "clang 3.9.0, libgcc 4.9.4",
+    "size": 166261192,
+    "digest": "52f3fc23f0f5c98050f8b0ac7c92a6752d067582a16f712a5a58074be98975d594f9e36249fc2be7f1cc2ca6d509c663faaf2bea66f949243cc1f41651638ba6",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/macosx64/asan.manifest
+++ b/browser/config/tooltool-manifests/macosx64/asan.manifest
@@ -1,10 +1,10 @@
 [
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-}
+  {
+    "version": "clang 3.8.0",
+    "size": 133060926,
+    "digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/macosx64/clang.manifest
+++ b/browser/config/tooltool-manifests/macosx64/clang.manifest
@@ -1,35 +1,35 @@
 [
-{
-"version": "clang 3.9.0",
-"size": 184678304,
-"digest": "cfde9a0f7f59823200f94422b4adb9a2fb5d4d07f240bbd1142c792434f6a1cbb4096d25c9853d77008fc40db0d827daa7003e78016f51241f621d6040ccc635",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 122706608,
-"digest": "b9ae830cfe24430907490cd58f8215447667fb8f1f052d6e78c8ecd7aadfbc92f75a404774d4cc7b30a46b756275209c2fe2723473704b3bce7ffee908e353a8",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
-"size": 1143715
-},
-{
-"version": "cctools port from commit hash 84ce22dbb22a26ce7f392e9de0ee39c2efe6fd68",
-"size": 2174783,
-"digest": "8678348faff8f344b377075007975ae77a55a2a73488e36950a43c8ec27a79970cd8e34003e33e756a57d9cbf5c3e2e4461184102c6c03f793377a4d250a7f24",
-"algorithm": "sha512",
-"filename": "cctools.tar.bz2",
-"unpack": true
-}
+  {
+    "version": "clang 3.9.0",
+    "size": 184678304,
+    "digest": "cfde9a0f7f59823200f94422b4adb9a2fb5d4d07f240bbd1142c792434f6a1cbb4096d25c9853d77008fc40db0d827daa7003e78016f51241f621d6040ccc635",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 122706608,
+    "digest": "b9ae830cfe24430907490cd58f8215447667fb8f1f052d6e78c8ecd7aadfbc92f75a404774d4cc7b30a46b756275209c2fe2723473704b3bce7ffee908e353a8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
+    "size": 1143715
+  },
+  {
+    "version": "cctools port from commit hash 84ce22dbb22a26ce7f392e9de0ee39c2efe6fd68",
+    "size": 2174783,
+    "digest": "8678348faff8f344b377075007975ae77a55a2a73488e36950a43c8ec27a79970cd8e34003e33e756a57d9cbf5c3e2e4461184102c6c03f793377a4d250a7f24",
+    "algorithm": "sha512",
+    "filename": "cctools.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/macosx64/cross-clang.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-clang.manifest
@@ -1,43 +1,43 @@
 [
-{
-"version": "clang 3.8.0, libgcc 4.9.4 + PR64905",
-"size": 155933720,
-"digest": "7a3a9a5ff455554d120596fe4bc06c19e41ecbd1e67b1e95e778c0b8ce6d9472f30fd4a27c66d48d9c047aac7a077f23f87397711dd6f33175f95cf4a2ada862",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 1349196,
-"visibility": "public",
-"digest": "438a36523a74cbc4a58226647e0501fa64a1b63f32931dc364a75d699df8accb45afdf26f4cb61c6ac7f58be530205acb6da22008bec19603c6f6fda3a12a8cc",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "cctools.tar.xz"
-},
-{
-"size": 30823112,
-"visibility": "internal",
-"digest": "0c58e06a3ea8f4641c991a7406fc8733c574f0b4aa773bce0feaa5468d2b8440fa33cea056e16fad2b8a7ef4409ca7228113eb12adc87c3e115129d8a3b3b565",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "MacOSX10.10.sdk.tar.xz"
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-}
+  {
+    "version": "clang 3.8.0, libgcc 4.9.4 + PR64905",
+    "size": 155933720,
+    "digest": "7a3a9a5ff455554d120596fe4bc06c19e41ecbd1e67b1e95e778c0b8ce6d9472f30fd4a27c66d48d9c047aac7a077f23f87397711dd6f33175f95cf4a2ada862",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 1349196,
+    "visibility": "public",
+    "digest": "438a36523a74cbc4a58226647e0501fa64a1b63f32931dc364a75d699df8accb45afdf26f4cb61c6ac7f58be530205acb6da22008bec19603c6f6fda3a12a8cc",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "cctools.tar.xz"
+  },
+  {
+    "size": 30823112,
+    "visibility": "internal",
+    "digest": "0c58e06a3ea8f4641c991a7406fc8733c574f0b4aa773bce0feaa5468d2b8440fa33cea056e16fad2b8a7ef4409ca7228113eb12adc87c3e115129d8a3b3b565",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "MacOSX10.10.sdk.tar.xz"
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  }
 ]
--- a/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/cross-releng.manifest
@@ -1,60 +1,60 @@
 [
-{
-"version": "clang 3.9.0",
-"size": 168062128,
-"digest": "2a5458a25792fcade86a56ff0f4acdfa284d2b62966991a7c34a92c2e8c0b4a162ce00512d4467754e7f74598d64c56e91517e1606ed3fba011f7c10e8ad3288",
-"algorithm": "sha512",
-"filename": "clang.tar.xz",
-"unpack": true
-},
-{
-"size": 6075028,
-"visibility": "public",
-"digest": "0b962ba55a5a2fbae44218683bdf6ea0dfe8165aba436173a065f7190976184586b9acf4c23478bc5b6d81a3e00f681bf16df0536c9c9718ad0570d064f69027",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "cctools.tar.xz"
-},
-{
-"size": 35215976,
-"visibility": "internal",
-"digest": "8be736545ddab25ebded188458ce974d5c9a7e29f3c50d2ebfbcb878f6aff853dd2ff5a3528bdefc64396a10101a1b50fd2fe52000140df33643cebe1ea759da",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "MacOSX10.7.sdk.tar.bz2"
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"version": "https://github.com/andreas56/libdmg-hfsplus rev 81dd75fd1549b24bf8af9736ac25518b367e6b63",
-"size": 62032,
-"visibility": "public",
-"digest": "9073c41034784eb8823ec817aed42bbc65c8da63ad3fac572726fa48b36320ee302ca8f51b23576e7fdbeec6ab300610d0c58bbd9c52024577dfdb13d95aa2ec",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "dmg.tar.xz"
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 140284816,
-"digest": "c97503ed2448af059a450792aac76f9b91ce8bc6daf683cdbc2d3fb49a6bd205a4ba854838281b1e3888ae15b5df585cc8fa56365fb1ec5acafc9e1b8871f3e3",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"size": 281576,
-"visibility": "public",
-"digest": "71616564533d138fb12f08e761c2638d054814fdf9c9439638ec57b201e100445c364d73d8d7a4f0e3b784898d5fe6264e8242863fc5ac40163f1791468bbc46",
-"algorithm": "sha512",
-"filename": "hfsplus-tools.tar.xz",
-"unpack": true
-}
+  {
+    "version": "clang 3.9.0",
+    "size": 168062128,
+    "digest": "2a5458a25792fcade86a56ff0f4acdfa284d2b62966991a7c34a92c2e8c0b4a162ce00512d4467754e7f74598d64c56e91517e1606ed3fba011f7c10e8ad3288",
+    "algorithm": "sha512",
+    "filename": "clang.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 6075028,
+    "visibility": "public",
+    "digest": "0b962ba55a5a2fbae44218683bdf6ea0dfe8165aba436173a065f7190976184586b9acf4c23478bc5b6d81a3e00f681bf16df0536c9c9718ad0570d064f69027",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "cctools.tar.xz"
+  },
+  {
+    "size": 35215976,
+    "visibility": "internal",
+    "digest": "8be736545ddab25ebded188458ce974d5c9a7e29f3c50d2ebfbcb878f6aff853dd2ff5a3528bdefc64396a10101a1b50fd2fe52000140df33643cebe1ea759da",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "MacOSX10.7.sdk.tar.bz2"
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  },
+  {
+    "version": "https://github.com/andreas56/libdmg-hfsplus rev 81dd75fd1549b24bf8af9736ac25518b367e6b63",
+    "size": 62032,
+    "visibility": "public",
+    "digest": "9073c41034784eb8823ec817aed42bbc65c8da63ad3fac572726fa48b36320ee302ca8f51b23576e7fdbeec6ab300610d0c58bbd9c52024577dfdb13d95aa2ec",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "dmg.tar.xz"
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 140284816,
+    "digest": "c97503ed2448af059a450792aac76f9b91ce8bc6daf683cdbc2d3fb49a6bd205a4ba854838281b1e3888ae15b5df585cc8fa56365fb1ec5acafc9e1b8871f3e3",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 281576,
+    "visibility": "public",
+    "digest": "71616564533d138fb12f08e761c2638d054814fdf9c9439638ec57b201e100445c364d73d8d7a4f0e3b784898d5fe6264e8242863fc5ac40163f1791468bbc46",
+    "algorithm": "sha512",
+    "filename": "hfsplus-tools.tar.xz",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/macosx64/releng.manifest
+++ b/browser/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,35 +1,35 @@
 [
-{
-"version": "clang 3.8.0",
-"size": 133060926,
-"digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 122706608,
-"digest": "b9ae830cfe24430907490cd58f8215447667fb8f1f052d6e78c8ecd7aadfbc92f75a404774d4cc7b30a46b756275209c2fe2723473704b3bce7ffee908e353a8",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "cctools port from commit hash db1f8d906cb28, ld only",
-"size": 634496,
-"digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
-"algorithm": "sha512",
-"filename": "cctools.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
-"size": 1143715
-}
+  {
+    "version": "clang 3.8.0",
+    "size": 133060926,
+    "digest": "aff5ad3ac2d41db19d1ba0df5f97b189a7d7e1b6af8c56e22c2b0cced84d75fa98394ded6a4ba5713652e6684a0a46f47aeccf87991f9e849bf8d7d82e564f6f",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 122706608,
+    "digest": "b9ae830cfe24430907490cd58f8215447667fb8f1f052d6e78c8ecd7aadfbc92f75a404774d4cc7b30a46b756275209c2fe2723473704b3bce7ffee908e353a8",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "cctools port from commit hash db1f8d906cb28, ld only",
+    "size": 634496,
+    "digest": "037f31fcf29e7bb7fada0d2bdd5e95c7d4cb2692f2a5c98ed6f6a7561b9d81622d015f0d12b291d3667719655f1369e8ce8a0a4a4773aa0ee4753e04a8821173",
+    "algorithm": "sha512",
+    "filename": "cctools.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "a285c7c6468ad7438262dfec90f65981e84abf2adbb1aa075c0ec1759b4f98ce5d5f14a3d555274f970704210a00738ba7d95db2fc320f7780e6b99bcb0ffb6c",
+    "size": 1143715
+  }
 ]
--- a/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
+++ b/browser/config/tooltool-manifests/win32/build-clang-cl.manifest
@@ -1,57 +1,57 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 67227255,
-"digest": "95164dc1abb2ab90ea18cf4f322d5c8390e0212e79a52b12578720d568eb6df62e55a9938c8d2a364cd3a6bd0f99608c2139d141a88ec43484b8d0651398532a",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-},
-{
-"version": "SVN 1.9.4, repacked from SlikSvn (https://sliksvn.com/download/)",
-"size": 3934520,
-"digest": "d3b8f74936857ecbf542e403ed6835938a31d65302985729cbfa7191bf2cf94138565cefcc2f31517098013fbfc51868348863a55b588250902f9dec214dbc42",
-"algorithm": "sha512",
-"filename": "svn194.zip",
-"unpack": true
-},
-{
-"version": "CMake 3.6.2 repack",
-"size": 19832889,
-"digest": "39b0508b60f655969d1b54c76753b14b5b2e92dab58613c835aed798a6aeb9077a7df78aebc011c2c753661fdc15007d3353c0c8773a53148380e2ec02afb629",
-"algorithm": "sha512",
-"filename": "cmake362.zip",
-"unpack": true
-},
-{
-"version": "Ninja 1.7.1",
-"size": 184821,
-"digest": "e4f9a1ae624a2630e75264ba37d396d9c7407d6e6aea3763056210ba6e1387908bd31cf4037a6a3661a418e86c4d2761e0c333e6a3bd0d66549d2b0d72d3f43b",
-"algorithm": "sha512",
-"filename": "ninja171.zip",
-"unpack": true
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 67227255,
+    "digest": "95164dc1abb2ab90ea18cf4f322d5c8390e0212e79a52b12578720d568eb6df62e55a9938c8d2a364cd3a6bd0f99608c2139d141a88ec43484b8d0651398532a",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
+    "size": 1179901
+  },
+  {
+    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
+    "size": 326656969,
+    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
+    "algorithm": "sha512",
+    "filename": "vs2015u3.zip",
+    "unpack": true
+  },
+  {
+    "version": "SVN 1.9.4, repacked from SlikSvn (https://sliksvn.com/download/)",
+    "size": 3934520,
+    "digest": "d3b8f74936857ecbf542e403ed6835938a31d65302985729cbfa7191bf2cf94138565cefcc2f31517098013fbfc51868348863a55b588250902f9dec214dbc42",
+    "algorithm": "sha512",
+    "filename": "svn194.zip",
+    "unpack": true
+  },
+  {
+    "version": "CMake 3.6.2 repack",
+    "size": 19832889,
+    "digest": "39b0508b60f655969d1b54c76753b14b5b2e92dab58613c835aed798a6aeb9077a7df78aebc011c2c753661fdc15007d3353c0c8773a53148380e2ec02afb629",
+    "algorithm": "sha512",
+    "filename": "cmake362.zip",
+    "unpack": true
+  },
+  {
+    "version": "Ninja 1.7.1",
+    "size": 184821,
+    "digest": "e4f9a1ae624a2630e75264ba37d396d9c7407d6e6aea3763056210ba6e1387908bd31cf4037a6a3661a418e86c4d2761e0c333e6a3bd0d66549d2b0d72d3f43b",
+    "algorithm": "sha512",
+    "filename": "ninja171.zip",
+    "unpack": true
+  }
 ]
--- a/browser/config/tooltool-manifests/win32/clang.manifest
+++ b/browser/config/tooltool-manifests/win32/clang.manifest
@@ -1,50 +1,50 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 67227255,
-"digest": "95164dc1abb2ab90ea18cf4f322d5c8390e0212e79a52b12578720d568eb6df62e55a9938c8d2a364cd3a6bd0f99608c2139d141a88ec43484b8d0651398532a",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-},
-{
-"version": "clang 5.0pre/r293859",
-"size": 309009013,
-"digest": "cd3ed31acefd185f441632158dde73538c62bab7ebf2a8ec630985ab345938ec522983721ddb1bead1de22d5ac1571d50a958ae002364d739f2a78c6e7244222",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 67227255,
+    "digest": "95164dc1abb2ab90ea18cf4f322d5c8390e0212e79a52b12578720d568eb6df62e55a9938c8d2a364cd3a6bd0f99608c2139d141a88ec43484b8d0651398532a",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
+    "size": 1179901
+  },
+  {
+    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
+    "size": 326656969,
+    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
+    "algorithm": "sha512",
+    "filename": "vs2015u3.zip",
+    "unpack": true
+  },
+  {
+    "version": "clang 5.0pre/r293859",
+    "size": 309009013,
+    "digest": "cd3ed31acefd185f441632158dde73538c62bab7ebf2a8ec630985ab345938ec522983721ddb1bead1de22d5ac1571d50a958ae002364d739f2a78c6e7244222",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "makecab.tar.bz2",
+    "unpack": true,
+    "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
+    "size": 297118
+  }
 ]
--- a/browser/config/tooltool-manifests/win32/l10n.manifest
+++ b/browser/config/tooltool-manifests/win32/l10n.manifest
@@ -1,8 +1,8 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  }
 ]
--- a/browser/config/tooltool-manifests/win32/releng.manifest
+++ b/browser/config/tooltool-manifests/win32/releng.manifest
@@ -1,42 +1,42 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 67227255,
-"digest": "95164dc1abb2ab90ea18cf4f322d5c8390e0212e79a52b12578720d568eb6df62e55a9938c8d2a364cd3a6bd0f99608c2139d141a88ec43484b8d0651398532a",
-"algorithm": "sha512",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 67227255,
+    "digest": "95164dc1abb2ab90ea18cf4f322d5c8390e0212e79a52b12578720d568eb6df62e55a9938c8d2a364cd3a6bd0f99608c2139d141a88ec43484b8d0651398532a",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
+    "size": 1179901
+  },
+  {
+    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
+    "size": 326656969,
+    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
+    "algorithm": "sha512",
+    "filename": "vs2015u3.zip",
+    "unpack": true
+  },
+  {
+    "version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "makecab.tar.bz2",
+    "unpack": true,
+    "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
+    "size": 297118
+  }
 ]
--- a/browser/config/tooltool-manifests/win64/clang.manifest
+++ b/browser/config/tooltool-manifests/win64/clang.manifest
@@ -1,51 +1,51 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 72782416,
-"digest": "bf9fb1a21de834d7b6992fe9d95dfe2ff19e3cbff5b00117889eef0e6c9d85442cd75640e3051f0c1788b1f629e79ffae5cc8a4106b0cad520c1f954ae2be6b0",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-},
-{
-"version": "clang 5.0pre/r293859",
-"size": 313862839,
-"digest": "44dee70d525ea93952af27f943d1cc773311970c31d971d2bc2e3437cce0c899f3a03ddd8e42e86f1b4fd9ab1c4bc1767cdb0406eb4b3934ae4fc272dab830dc",
-"algorithm": "sha512",
-"filename": "clang.tar.bz2",
-"unpack": true
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 72782416,
+    "digest": "bf9fb1a21de834d7b6992fe9d95dfe2ff19e3cbff5b00117889eef0e6c9d85442cd75640e3051f0c1788b1f629e79ffae5cc8a4106b0cad520c1f954ae2be6b0",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
+    "size": 1179901
+  },
+  {
+    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
+    "size": 326656969,
+    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
+    "algorithm": "sha512",
+    "filename": "vs2015u3.zip",
+    "unpack": true
+  },
+  {
+    "version": "clang 5.0pre/r293859",
+    "size": 313862839,
+    "digest": "44dee70d525ea93952af27f943d1cc773311970c31d971d2bc2e3437cce0c899f3a03ddd8e42e86f1b4fd9ab1c4bc1767cdb0406eb4b3934ae4fc272dab830dc",
+    "algorithm": "sha512",
+    "filename": "clang.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "makecab.tar.bz2",
+    "unpack": true,
+    "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
+    "size": 297118
+  }
 ]
--- a/browser/config/tooltool-manifests/win64/l10n.manifest
+++ b/browser/config/tooltool-manifests/win64/l10n.manifest
@@ -1,8 +1,8 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  }
 ]
--- a/browser/config/tooltool-manifests/win64/releng.manifest
+++ b/browser/config/tooltool-manifests/win64/releng.manifest
@@ -1,43 +1,43 @@
 [
-{
-"size": 266240,
-"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
-"algorithm": "sha512",
-"filename": "mozmake.exe"
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 72782416,
-"digest": "bf9fb1a21de834d7b6992fe9d95dfe2ff19e3cbff5b00117889eef0e6c9d85442cd75640e3051f0c1788b1f629e79ffae5cc8a4106b0cad520c1f954ae2be6b0",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "rustc.tar.bz2",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.bz2",
-"unpack": true,
-"digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
-"size": 1179901
-},
-{
-"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
-"size": 326656969,
-"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
-"algorithm": "sha512",
-"filename": "vs2015u3.zip",
-"unpack": true
-},
-{
-"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "makecab.tar.bz2",
-"unpack": true,
-"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
-"size": 297118
-}
+  {
+    "size": 266240,
+    "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
+    "algorithm": "sha512",
+    "filename": "mozmake.exe"
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 72782416,
+    "digest": "bf9fb1a21de834d7b6992fe9d95dfe2ff19e3cbff5b00117889eef0e6c9d85442cd75640e3051f0c1788b1f629e79ffae5cc8a4106b0cad520c1f954ae2be6b0",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "rustc.tar.bz2",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.bz2",
+    "unpack": true,
+    "digest": "7dee5c5602b3830cb8ac45ebaa8542714bbac0e50eabbff58a06972a02ceeab75ed7c56ff22a23f760b8317ae8e9a01cdecfaf75a7acbd2a4cdd817967170d2e",
+    "size": 1179901
+  },
+  {
+    "version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
+    "size": 326656969,
+    "digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
+    "algorithm": "sha512",
+    "filename": "vs2015u3.zip",
+    "unpack": true
+  },
+  {
+    "version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "makecab.tar.bz2",
+    "unpack": true,
+    "digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
+    "size": 297118
+  }
 ]
--- a/js/src/devtools/rootAnalysis/build/gcc-b2g.manifest
+++ b/js/src/devtools/rootAnalysis/build/gcc-b2g.manifest
@@ -1,11 +1,11 @@
 [
-{
-"version": "gcc 4.9.3",
-"size": 102421980,
-"visibility": "public",
-"digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.3",
+    "size": 102421980,
+    "visibility": "public",
+    "digest": "f25292aa93dc449e0472eee511c0ac15b5f1a4272ab76cf53ce5d20dc57f29e83da49ae1a9d9e994192647f75e13ae60f75ba2ac3cb9d26d5f5d6cabf88de921",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  }
 ]
--- a/js/src/devtools/rootAnalysis/build/gcc.manifest
+++ b/js/src/devtools/rootAnalysis/build/gcc.manifest
@@ -1,18 +1,18 @@
 [
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 12072532,
-"digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
-"algorithm": "sha512",
-"filename": "gtk3.tar.xz",
-"setup": "setup.sh",
-"unpack": true
-}
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 12072532,
+    "digest": "3915f8ec396c56a8a92e6f9695b70f09ce9d1582359d1258e37e3fd43a143bc974410e4cfc27f500e095f34a8956206e0ebf799b7287f0f38def0d5e34ed71c9",
+    "algorithm": "sha512",
+    "filename": "gtk3.tar.xz",
+    "setup": "setup.sh",
+    "unpack": true
+  }
 ]
--- a/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-frontend/releng.manifest
@@ -1,58 +1,58 @@
 [
-{
-"versions": [
-  "Android SDK 6.0 / API 23",
-  "Android tools r24.4",
-  "Android build tools 23.0.3",
-  "Android Support Repository (Support Library 23.0.1)",
-  "Google Support Repository (Google Play Services 8.1.0)"
-],
-"size": 573952124,
-"visibility": "internal",
-"digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
-"algorithm": "sha512",
-"filename": "android-sdk-linux.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"size": 30899096,
-"visibility": "public",
-"digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
-"algorithm": "sha512",
-"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
-"unpack": true
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "jcentral.tar.xz",
-"unpack": true,
-"digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",
-"size": 52463192
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "gradle-dist.tar.xz",
-"unpack": true,
-"digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
-"size": 51753660
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "dotgradle.tar.xz",
-"unpack": true,
-"digest": "9f082ccd71ad18991eb71fcad355c6990f50a72a09ab9b79696521485656083a72faf5a8d4714de9c4b901ee2319b6786a51964846bb7075061642a8505501c2",
-"size": 512
-}
+  {
+    "versions": [
+      "Android SDK 6.0 / API 23",
+      "Android tools r24.4",
+      "Android build tools 23.0.3",
+      "Android Support Repository (Support Library 23.0.1)",
+      "Google Support Repository (Google Play Services 8.1.0)"
+    ],
+    "size": 573952124,
+    "visibility": "internal",
+    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "algorithm": "sha512",
+    "filename": "android-sdk-linux.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  },
+  {
+    "size": 30899096,
+    "visibility": "public",
+    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "algorithm": "sha512",
+    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+    "unpack": true
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "jcentral.tar.xz",
+    "unpack": true,
+    "digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",
+    "size": 52463192
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "gradle-dist.tar.xz",
+    "unpack": true,
+    "digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
+    "size": 51753660
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "dotgradle.tar.xz",
+    "unpack": true,
+    "digest": "9f082ccd71ad18991eb71fcad355c6990f50a72a09ab9b79696521485656083a72faf5a8d4714de9c4b901ee2319b6786a51964846bb7075061642a8505501c2",
+    "size": 512
+  }
 ]
--- a/mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-gradle-dependencies/releng.manifest
@@ -1,50 +1,50 @@
 [
-{
-"versions": [
-  "Android SDK 6.0 / API 23",
-  "Android tools r24.4",
-  "Android build tools 23.0.3",
-  "Android Support Repository (Support Library 23.0.1)",
-  "Google Support Repository (Google Play Services 8.1.0)"
-],
-"size": 573952124,
-"visibility": "internal",
-"digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
-"algorithm": "sha512",
-"filename": "android-sdk-linux.tar.xz",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 92456268,
-"digest": "daf44b245cb258e105068c1befbd656039854c4a93e2aefe487bdb42650c32e63ee6f14c7a4ad5b3aa964a29f2814c8cb007b1d287e001c969a124f0bcf461e5",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"size": 30899096,
-"visibility": "public",
-"digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
-"algorithm": "sha512",
-"unpack": true,
-"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz"
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "dotgradle-online.tar.xz",
-"unpack": true,
-"digest": "0979eb1dcd9349a9c3f51f24747bb6e19e803226d7150fcf6846889ae24a8df925d03edfac038a5330822703c51130d4f5757d9f4caff7bcb2b6f71858c024d3",
-"size": 512
-}
+  {
+    "versions": [
+      "Android SDK 6.0 / API 23",
+      "Android tools r24.4",
+      "Android build tools 23.0.3",
+      "Android Support Repository (Support Library 23.0.1)",
+      "Google Support Repository (Google Play Services 8.1.0)"
+    ],
+    "size": 573952124,
+    "visibility": "internal",
+    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "algorithm": "sha512",
+    "filename": "android-sdk-linux.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 92456268,
+    "digest": "daf44b245cb258e105068c1befbd656039854c4a93e2aefe487bdb42650c32e63ee6f14c7a4ad5b3aa964a29f2814c8cb007b1d287e001c969a124f0bcf461e5",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  },
+  {
+    "size": 30899096,
+    "visibility": "public",
+    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "algorithm": "sha512",
+    "unpack": true,
+    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz"
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "dotgradle-online.tar.xz",
+    "unpack": true,
+    "digest": "0979eb1dcd9349a9c3f51f24747bb6e19e803226d7150fcf6846889ae24a8df925d03edfac038a5330822703c51130d4f5757d9f4caff7bcb2b6f71858c024d3",
+    "size": 512
+  }
 ]
--- a/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android-x86/releng.manifest
@@ -1,82 +1,82 @@
 [
-{
-"version": "Android NDK r11c",
-"size": 138388708,
-"visibility": "internal",
-"digest": "2dc605644e84fadf399a4e5cb60dfb3b42518803f80de15ef310ead4d0084a01dce3052bbf7d9dfb8bbe027019250235afe0a1e4ffdc87babc0f2bdbf2403232",
-"algorithm": "sha512",
-"filename": "android-ndk.tar.bz2",
-"unpack": true
-},
-{
-"versions": [
-"Android SDK 6.0 / API 23",
-"Android tools r24.4",
-"Android build tools 23.0.3",
-"Android Support Repository (Support Library 23.0.1)",
-"Google Support Repository (Google Play Services 8.1.0)"
-],
-"size": 573952124,
-"visibility": "internal",
-"digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
-"algorithm": "sha512",
-"filename": "android-sdk-linux.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"size": 4906080,
-"digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
-"algorithm": "sha512",
-"filename": "jsshell.tar.xz",
-"unpack": true
-},
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 92456268,
-"digest": "daf44b245cb258e105068c1befbd656039854c4a93e2aefe487bdb42650c32e63ee6f14c7a4ad5b3aa964a29f2814c8cb007b1d287e001c969a124f0bcf461e5",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "jcentral.tar.xz",
-"unpack": true,
-"digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",
-"size": 52463192
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "gradle-dist.tar.xz",
-"unpack": true,
-"digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
-"size": 51753660
-},
-{
-"size": 30899096,
-"visibility": "public",
-"digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
-"algorithm": "sha512",
-"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
-"unpack": true
-}
+  {
+    "version": "Android NDK r11c",
+    "size": 138388708,
+    "visibility": "internal",
+    "digest": "2dc605644e84fadf399a4e5cb60dfb3b42518803f80de15ef310ead4d0084a01dce3052bbf7d9dfb8bbe027019250235afe0a1e4ffdc87babc0f2bdbf2403232",
+    "algorithm": "sha512",
+    "filename": "android-ndk.tar.bz2",
+    "unpack": true
+  },
+  {
+    "versions": [
+      "Android SDK 6.0 / API 23",
+      "Android tools r24.4",
+      "Android build tools 23.0.3",
+      "Android Support Repository (Support Library 23.0.1)",
+      "Google Support Repository (Google Play Services 8.1.0)"
+    ],
+    "size": 573952124,
+    "visibility": "internal",
+    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "algorithm": "sha512",
+    "filename": "android-sdk-linux.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  },
+  {
+    "size": 4906080,
+    "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
+    "algorithm": "sha512",
+    "filename": "jsshell.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 92456268,
+    "digest": "daf44b245cb258e105068c1befbd656039854c4a93e2aefe487bdb42650c32e63ee6f14c7a4ad5b3aa964a29f2814c8cb007b1d287e001c969a124f0bcf461e5",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "jcentral.tar.xz",
+    "unpack": true,
+    "digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",
+    "size": 52463192
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "gradle-dist.tar.xz",
+    "unpack": true,
+    "digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
+    "size": 51753660
+  },
+  {
+    "size": 30899096,
+    "visibility": "public",
+    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "algorithm": "sha512",
+    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+    "unpack": true
+  }
 ]
--- a/mobile/android/config/tooltool-manifests/android/releng.manifest
+++ b/mobile/android/config/tooltool-manifests/android/releng.manifest
@@ -1,91 +1,91 @@
 [
-{
-"version": "Android NDK r11c",
-"size": 138388708,
-"visibility": "internal",
-"digest": "2dc605644e84fadf399a4e5cb60dfb3b42518803f80de15ef310ead4d0084a01dce3052bbf7d9dfb8bbe027019250235afe0a1e4ffdc87babc0f2bdbf2403232",
-"algorithm": "sha512",
-"filename": "android-ndk.tar.bz2",
-"unpack": true
-},
-{
-"versions": [
-  "Android SDK 6.0 / API 23",
-  "Android tools r24.4",
-  "Android build tools 23.0.3",
-  "Android Support Repository (Support Library 23.0.1)",
-  "Google Support Repository (Google Play Services 8.1.0)"
-],
-"size": 573952124,
-"visibility": "internal",
-"digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
-"algorithm": "sha512",
-"filename": "android-sdk-linux.tar.xz",
-"unpack": true
-},
-{
-"version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "sccache2.tar.xz",
-"unpack": true,
-"digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
-"size": 1020700
-},
-{
-"size": 4906080,
-"visibility": "public",
-"unpack": true,
-"digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
-"algorithm": "sha512",
-"filename": "jsshell.tar.xz"
-},
-{
-"version": "gcc 4.9.4 + PR64905",
-"size": 101297752,
-"digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
-"algorithm": "sha512",
-"filename": "gcc.tar.xz",
-"unpack": true
-},
-{
-"size": 30899096,
-"visibility": "public",
-"digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
-"algorithm": "sha512",
-"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
-"unpack": true
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "jcentral.tar.xz",
-"unpack": true,
-"digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",
-"size": 52463192
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "gradle-dist.tar.xz",
-"unpack": true,
-"digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
-"size": 51753660
-},
-{
-"version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
-"size": 92456268,
-"digest": "daf44b245cb258e105068c1befbd656039854c4a93e2aefe487bdb42650c32e63ee6f14c7a4ad5b3aa964a29f2814c8cb007b1d287e001c969a124f0bcf461e5",
-"algorithm": "sha512",
-"filename": "rustc.tar.xz",
-"unpack": true
-},
-{
-"algorithm": "sha512",
-"visibility": "public",
-"filename": "dotgradle.tar.xz",
-"unpack": true,
-"digest": "9f082ccd71ad18991eb71fcad355c6990f50a72a09ab9b79696521485656083a72faf5a8d4714de9c4b901ee2319b6786a51964846bb7075061642a8505501c2",
-"size": 512
-}
+  {
+    "version": "Android NDK r11c",
+    "size": 138388708,
+    "visibility": "internal",
+    "digest": "2dc605644e84fadf399a4e5cb60dfb3b42518803f80de15ef310ead4d0084a01dce3052bbf7d9dfb8bbe027019250235afe0a1e4ffdc87babc0f2bdbf2403232",
+    "algorithm": "sha512",
+    "filename": "android-ndk.tar.bz2",
+    "unpack": true
+  },
+  {
+    "versions": [
+      "Android SDK 6.0 / API 23",
+      "Android tools r24.4",
+      "Android build tools 23.0.3",
+      "Android Support Repository (Support Library 23.0.1)",
+      "Google Support Repository (Google Play Services 8.1.0)"
+    ],
+    "size": 573952124,
+    "visibility": "internal",
+    "digest": "1d495d7a7386af3f27b14982e0ff7b0963fd1a63a08040b9b1db0e94c9681fa3704c195ba8be23b5f73e15101b2b767293bc8f96e0584e17867ef13b074e5038",
+    "algorithm": "sha512",
+    "filename": "android-sdk-linux.tar.xz",
+    "unpack": true
+  },
+  {
+    "version": "sccache rev b21198a7183a2fe226ff49348b1c0b51bae9f4f8",
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "sccache2.tar.xz",
+    "unpack": true,
+    "digest": "b89c40dbf28c2bd54fadf017c15a8789f6e7611252a623cc3a1507e3dd6fc9e5a50d746e81776ba856e33fdc99b4a6413ba7c3ac0aed5f4835705da2b758ef22",
+    "size": 1020700
+  },
+  {
+    "size": 4906080,
+    "visibility": "public",
+    "unpack": true,
+    "digest": "d735544e039da89382c53b2302b7408d4610247b4f8b5cdc5a4d5a8ec5470947b19e8ea7f7a37e78222e661347e394e0030d81f41534138b527b14e9c4e55634",
+    "algorithm": "sha512",
+    "filename": "jsshell.tar.xz"
+  },
+  {
+    "version": "gcc 4.9.4 + PR64905",
+    "size": 101297752,
+    "digest": "42aa2e3fdd232b5e390472a788e7f7db71a1fee4221e260b6cb58c9a1d73e6cdd10afcbac137f7844290169cd6b561b424ecc92b159e9726b0ad5de3f478a8be",
+    "algorithm": "sha512",
+    "filename": "gcc.tar.xz",
+    "unpack": true
+  },
+  {
+    "size": 30899096,
+    "visibility": "public",
+    "digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
+    "algorithm": "sha512",
+    "filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
+    "unpack": true
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "jcentral.tar.xz",
+    "unpack": true,
+    "digest": "28b36cc7a74babc9075aad2a11d3489242f76a90c3701b86fca91a215e3d31c2fcd89bd23a574af7b3f374c0ca3f247fd073ab2e68a2b26ea45e2c9a7494df0f",
+    "size": 52463192
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "gradle-dist.tar.xz",
+    "unpack": true,
+    "digest": "e3cfe7f8259ad97722243d4e873d5a05c014bfc24d637427f89d804bf5073290229c778ea303142cf06c2dc79e0492f23521f57d3a73825f55b8db587317646f",
+    "size": 51753660
+  },
+  {
+    "version": "rustc 1.15.1 (021bd294c 2017-02-08) repack",
+    "size": 92456268,
+    "digest": "daf44b245cb258e105068c1befbd656039854c4a93e2aefe487bdb42650c32e63ee6f14c7a4ad5b3aa964a29f2814c8cb007b1d287e001c969a124f0bcf461e5",
+    "algorithm": "sha512",
+    "filename": "rustc.tar.xz",
+    "unpack": true
+  },
+  {
+    "algorithm": "sha512",
+    "visibility": "public",
+    "filename": "dotgradle.tar.xz",
+    "unpack": true,
+    "digest": "9f082ccd71ad18991eb71fcad355c6990f50a72a09ab9b79696521485656083a72faf5a8d4714de9c4b901ee2319b6786a51964846bb7075061642a8505501c2",
+    "size": 512
+  }
 ]
--- a/taskcluster/docker/recipes/install-mercurial.sh
+++ b/taskcluster/docker/recipes/install-mercurial.sh
@@ -58,55 +58,55 @@ elif [ -f /etc/centos-release ]; then
     fi
 
     CERT_PATH=/etc/ssl/certs/ca-bundle.crt
 fi
 
 if [ -n "${HG_DEB}" ]; then
 tooltool_fetch <<EOF
 [
-{
+  {
     "size": ${HG_SIZE},
     "digest": "${HG_DIGEST}",
     "algorithm": "sha512",
     "filename": "${HG_FILENAME}"
-},
-{
+  },
+  {
     "size": ${HG_COMMON_SIZE},
     "digest": "${HG_COMMON_DIGEST}",
     "algorithm": "sha512",
     "filename": "${HG_COMMON_FILENAME}"
-}
+  }
 ]
 EOF
 
     dpkg -i ${HG_COMMON_FILENAME} ${HG_FILENAME}
 elif [ -n "${HG_RPM}" ]; then
 tooltool_fetch <<EOF
 [
-{
+  {
     "size": ${HG_SIZE},
     "digest": "${HG_DIGEST}",
     "algorithm": "sha512",
     "filename": "${HG_FILENAME}"
-}
+  }
 ]
 EOF
 
     rpm -i ${HG_FILENAME}
 elif [ -n "${PIP_PATH}" ]; then
 tooltool_fetch <<EOF
 [
-{
-"size": 4797967,
-"visibility": "public",
-"digest": "d96e45cafd36be692d6ce5259e18140641c24f73d4731ff767df0f39af425b0630c687436fc0f53d5882495ceacacaadd5e19f8f7c701b4b94c48631123b4666",
-"algorithm": "sha512",
-"filename": "mercurial-3.9.1.tar.gz"
-}
+  {
+    "size": 4797967,
+    "visibility": "public",
+    "digest": "d96e45cafd36be692d6ce5259e18140641c24f73d4731ff767df0f39af425b0630c687436fc0f53d5882495ceacacaadd5e19f8f7c701b4b94c48631123b4666",
+    "algorithm": "sha512",
+    "filename": "mercurial-3.9.1.tar.gz"
+  }
 ]
 EOF
 
    ${PIP_PATH} install mercurial-3.9.1.tar.gz
 else
     echo "Do not know how to install Mercurial on this OS"
     exit 1
 fi
--- a/testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest
+++ b/testing/config/tooltool-manifests/androidarm_4_3/mach-emulator.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 138436966,
-"digest": "25463edb2ebec6db0a2ebe72802d6b59fbfbce638bd4629f97842b197f674666dfdfd660dd2d0dd7542deba660ede20314402054b6e0866c9741c8fbd824eb91",
-"algorithm": "sha512",
-"filename": "AVDs-armv7a-android-4.3.1_r1-build-2017-03-09.tar.gz",
-"unpack": true
-}
+  {
+    "size": 138436966,
+    "digest": "25463edb2ebec6db0a2ebe72802d6b59fbfbce638bd4629f97842b197f674666dfdfd660dd2d0dd7542deba660ede20314402054b6e0866c9741c8fbd824eb91",
+    "algorithm": "sha512",
+    "filename": "AVDs-armv7a-android-4.3.1_r1-build-2017-03-09.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/androidarm_4_3/releng.manifest
+++ b/testing/config/tooltool-manifests/androidarm_4_3/releng.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 130236026,
-"digest": "2f98a293895134c02c137c052bec5d9e5e2aab5051b218278b9c6f849aaf82a0a91e2302ec6d7c98e6cc27133c58436b4b2431c35c8eb7c4db03584fc7c18bd2",
-"algorithm": "sha512",
-"filename": "AVDs-armv7a-android-4.3.1_r1-build-2016-08-02.tar.gz",
-"unpack": true
-}
+  {
+    "size": 130236026,
+    "digest": "2f98a293895134c02c137c052bec5d9e5e2aab5051b218278b9c6f849aaf82a0a91e2302ec6d7c98e6cc27133c58436b4b2431c35c8eb7c4db03584fc7c18bd2",
+    "algorithm": "sha512",
+    "filename": "AVDs-armv7a-android-4.3.1_r1-build-2016-08-02.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest
+++ b/testing/config/tooltool-manifests/androidarm_6_0/mach-emulator.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 276089293,
-"digest": "a5aca63869d9ca9770b2f760923e65c08a36e4235f4bf9c422c9fd005c78b24bd7d8c74e9b8d11a4606d1d7081bd7181866f1ec50d1d87ad8de93521090d2d36",
-"algorithm": "sha512",
-"filename": "AVDs-armv7a-android-6.0-build-2016-08-12.tar.gz",
-"unpack": true
-}
+  {
+    "size": 276089293,
+    "digest": "a5aca63869d9ca9770b2f760923e65c08a36e4235f4bf9c422c9fd005c78b24bd7d8c74e9b8d11a4606d1d7081bd7181866f1ec50d1d87ad8de93521090d2d36",
+    "algorithm": "sha512",
+    "filename": "AVDs-armv7a-android-6.0-build-2016-08-12.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/androidx86/mach-emulator.manifest
+++ b/testing/config/tooltool-manifests/androidx86/mach-emulator.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 140180128,
-"visibility": "public",
-"digest": "09a3ef5dc9f91a80ab5f4b82200665eb30cae44681c5cbbfdbf0496b038fc44cb277041011fe77489cfb37d3715c723b67418650e503a80e4d7093094339d26f",
-"algorithm": "sha512",
-"filename": "AVDs-x86-android-4.2_r1-build-2016-11-18.tar.gz",
-"unpack": true
-}
+  {
+    "size": 140180128,
+    "visibility": "public",
+    "digest": "09a3ef5dc9f91a80ab5f4b82200665eb30cae44681c5cbbfdbf0496b038fc44cb277041011fe77489cfb37d3715c723b67418650e503a80e4d7093094339d26f",
+    "algorithm": "sha512",
+    "filename": "AVDs-x86-android-4.2_r1-build-2016-11-18.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/androidx86/releng.manifest
+++ b/testing/config/tooltool-manifests/androidx86/releng.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 140180128,
-"visibility": "public",
-"digest": "09a3ef5dc9f91a80ab5f4b82200665eb30cae44681c5cbbfdbf0496b038fc44cb277041011fe77489cfb37d3715c723b67418650e503a80e4d7093094339d26f",
-"algorithm": "sha512",
-"filename": "AVDs-x86-android-4.2_r1-build-2016-11-18.tar.gz",
-"unpack": true
-}
+  {
+    "size": 140180128,
+    "visibility": "public",
+    "digest": "09a3ef5dc9f91a80ab5f4b82200665eb30cae44681c5cbbfdbf0496b038fc44cb277041011fe77489cfb37d3715c723b67418650e503a80e4d7093094339d26f",
+    "algorithm": "sha512",
+    "filename": "AVDs-x86-android-4.2_r1-build-2016-11-18.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest
+++ b/testing/config/tooltool-manifests/androidx86_6_0/mach-emulator.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 416677519,
-"visibility": "public",
-"digest": "11a1be4d1f1085b1aa516c4f37b4a5d1e81e13bccd1243ebf8bf8431fd3738830675ea3719888ac43931b3b73508040090fd2ff6dd98f99db2678a7cfd6b18a4",
-"algorithm": "sha512",
-"filename": "AVDs-x86-android-6.0-build-2017-03-10.tar.gz",
-"unpack": true
-}
+  {
+    "size": 416677519,
+    "visibility": "public",
+    "digest": "11a1be4d1f1085b1aa516c4f37b4a5d1e81e13bccd1243ebf8bf8431fd3738830675ea3719888ac43931b3b73508040090fd2ff6dd98f99db2678a7cfd6b18a4",
+    "algorithm": "sha512",
+    "filename": "AVDs-x86-android-6.0-build-2017-03-10.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/hostutils.manifest
+++ b/testing/config/tooltool-manifests/linux32/hostutils.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 73158714,
-"visibility": "public",
-"digest": "b660a4c08207a8cd5a96ec6a2254bd909fa782e0223b3f3335dfb8913e5ba8e4fc9fb560079fc11b03731d75af55949b81b197ca2f60393f6ee5af93b47e1c0a",
-"algorithm": "sha512",
-"filename": "host-utils-50.0a1.en-US.linux-i686.tar.gz",
-"unpack": true
-}
+  {
+    "size": 73158714,
+    "visibility": "public",
+    "digest": "b660a4c08207a8cd5a96ec6a2254bd909fa782e0223b3f3335dfb8913e5ba8e4fc9fb560079fc11b03731d75af55949b81b197ca2f60393f6ee5af93b47e1c0a",
+    "algorithm": "sha512",
+    "filename": "host-utils-50.0a1.en-US.linux-i686.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/jimdb-arm-pie.manifest
+++ b/testing/config/tooltool-manifests/linux32/jimdb-arm-pie.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 1961068,
-"visibility": "public",
-"digest": "84ae9acfff4428d6ec167f1378d34972eb836d39b7aeeb94f5fd490eb6ca75043902cecd5e85ffd1d2de99313a7e0f80889897cbd1d52fa8b939d6dfb17167c8",
-"algorithm": "sha512",
-"filename": "jimdb-arm-pie-linux_x86.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 1961068,
+    "visibility": "public",
+    "digest": "84ae9acfff4428d6ec167f1378d34972eb836d39b7aeeb94f5fd490eb6ca75043902cecd5e85ffd1d2de99313a7e0f80889897cbd1d52fa8b939d6dfb17167c8",
+    "algorithm": "sha512",
+    "filename": "jimdb-arm-pie-linux_x86.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/jimdb-arm.manifest
+++ b/testing/config/tooltool-manifests/linux32/jimdb-arm.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 1947653,
-"visibility": "public",
-"digest": "37810f1f10a2535f1d609ab3fe6b029e14465361c1daa664a9511f46dd56e10aad881a69aa9b69ccb1e483add5030086610bec3f5b7f9409152a0abdf0a98f36",
-"algorithm": "sha512",
-"filename": "jimdb-arm-linux_x86.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 1947653,
+    "visibility": "public",
+    "digest": "37810f1f10a2535f1d609ab3fe6b029e14465361c1daa664a9511f46dd56e10aad881a69aa9b69ccb1e483add5030086610bec3f5b7f9409152a0abdf0a98f36",
+    "algorithm": "sha512",
+    "filename": "jimdb-arm-linux_x86.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/jimdb-x86-pie.manifest
+++ b/testing/config/tooltool-manifests/linux32/jimdb-x86-pie.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2178685,
-"visibility": "public",
-"digest": "3cc22e0fd0c97ed5f7c834665ed9f2692c423767ce5013b753fdeccd174c611e89371bf9fc191dce1ab2089999a66222e0e7b092b52ab742434b9ae2fdd5ec68",
-"algorithm": "sha512",
-"filename": "jimdb-x86-pie-linux_x86.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2178685,
+    "visibility": "public",
+    "digest": "3cc22e0fd0c97ed5f7c834665ed9f2692c423767ce5013b753fdeccd174c611e89371bf9fc191dce1ab2089999a66222e0e7b092b52ab742434b9ae2fdd5ec68",
+    "algorithm": "sha512",
+    "filename": "jimdb-x86-pie-linux_x86.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/jimdb-x86.manifest
+++ b/testing/config/tooltool-manifests/linux32/jimdb-x86.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2021932,
-"visibility": "public",
-"digest": "022e9a0585e9df44e28e8c9f2ce7a46fc07df8e137f5b0badd7b6b59f2d886b91813efdaf1d7d2dd4764b07a9ebc97f94456f1f6b17eabc5dd2c12b1c1c7c11c",
-"algorithm": "sha512",
-"filename": "jimdb-x86-linux_x86.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2021932,
+    "visibility": "public",
+    "digest": "022e9a0585e9df44e28e8c9f2ce7a46fc07df8e137f5b0badd7b6b59f2d886b91813efdaf1d7d2dd4764b07a9ebc97f94456f1f6b17eabc5dd2c12b1c1c7c11c",
+    "algorithm": "sha512",
+    "filename": "jimdb-x86-linux_x86.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/nodejs.manifest
+++ b/testing/config/tooltool-manifests/linux32/nodejs.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 13426698,
-"visibility": "internal",
-"digest": "d2b45d3e2fab867152e2063785af48ead3f4d34b4dd614c1e0867f3eeef0c8088a4ffe811400234827293ff8b75f34f45b45eca991e4eed7de37934a7400a9ac",
-"algorithm": "sha512",
-"filename": "node-linux-x86.tar.gz",
-"unpack": true
-}
+  {
+    "size": 13426698,
+    "visibility": "internal",
+    "digest": "d2b45d3e2fab867152e2063785af48ead3f4d34b4dd614c1e0867f3eeef0c8088a4ffe811400234827293ff8b75f34f45b45eca991e4eed7de37934a7400a9ac",
+    "algorithm": "sha512",
+    "filename": "node-linux-x86.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux32/releng.manifest
+++ b/testing/config/tooltool-manifests/linux32/releng.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 1845800,
-"visibility": "public",
-"digest": "70cf423b4cc04c2a7bdb50b802e2528d517c5c5192cd94b729e7b07fc5e943c709bed2357287b5388a5332b7be31b13a0d334fded6ae7c36c12ceda1710b901a",
-"algorithm": "sha512",
-"filename": "linux32-minidump_stackwalk"
-}
+  {
+    "size": 1845800,
+    "visibility": "public",
+    "digest": "70cf423b4cc04c2a7bdb50b802e2528d517c5c5192cd94b729e7b07fc5e943c709bed2357287b5388a5332b7be31b13a0d334fded6ae7c36c12ceda1710b901a",
+    "algorithm": "sha512",
+    "filename": "linux32-minidump_stackwalk"
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/hostutils.manifest
+++ b/testing/config/tooltool-manifests/linux64/hostutils.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 73513349,
-"visibility": "public",
-"digest": "0dd5be33c2a932c3914f23920fc4944b735fbfd59063fa502e581aaa7685e4547c998b091902b86963bceeb0c55fbf552fbeb2e7eb654ec3be2aa07b893c6c64",
-"algorithm": "sha512",
-"filename": "host-utils-50.0a1.en-US.linux-x86_64.tar.gz",
-"unpack": true
-}
+  {
+    "size": 73513349,
+    "visibility": "public",
+    "digest": "0dd5be33c2a932c3914f23920fc4944b735fbfd59063fa502e581aaa7685e4547c998b091902b86963bceeb0c55fbf552fbeb2e7eb654ec3be2aa07b893c6c64",
+    "algorithm": "sha512",
+    "filename": "host-utils-50.0a1.en-US.linux-x86_64.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/jimdb-arm-pie.manifest
+++ b/testing/config/tooltool-manifests/linux64/jimdb-arm-pie.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2020690,
-"visibility": "public",
-"digest": "a057e96cc087d6108ae6b5cfa9829101628172bb58807257301224f552158f72a87bcfa85eb09991b5e7487a8154690a352bae63f599b8a4f3f02f346961fe8e",
-"algorithm": "sha512",
-"filename": "jimdb-arm-pie-linux_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2020690,
+    "visibility": "public",
+    "digest": "a057e96cc087d6108ae6b5cfa9829101628172bb58807257301224f552158f72a87bcfa85eb09991b5e7487a8154690a352bae63f599b8a4f3f02f346961fe8e",
+    "algorithm": "sha512",
+    "filename": "jimdb-arm-pie-linux_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/jimdb-arm.manifest
+++ b/testing/config/tooltool-manifests/linux64/jimdb-arm.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2008279,
-"visibility": "public",
-"digest": "929cb2192b0fdfeecd3d1cf210c10bfe54cf5a617420751a69815d390a0a646cb7240d1326c80fc6bee5d913f851a398a64ecb7a604c06f02799d62cd8117e3b",
-"algorithm": "sha512",
-"filename": "jimdb-arm-linux_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2008279,
+    "visibility": "public",
+    "digest": "929cb2192b0fdfeecd3d1cf210c10bfe54cf5a617420751a69815d390a0a646cb7240d1326c80fc6bee5d913f851a398a64ecb7a604c06f02799d62cd8117e3b",
+    "algorithm": "sha512",
+    "filename": "jimdb-arm-linux_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/jimdb-x86-pie.manifest
+++ b/testing/config/tooltool-manifests/linux64/jimdb-x86-pie.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2263182,
-"visibility": "public",
-"digest": "24711d54143978caa77c5db54fc7da142c82c827a9bbbfad0a133ed30440e9a46b7e7fcd9ade886dbc5f0d7cd11a4facb3aeb573303becf6169234edef6f84e9",
-"algorithm": "sha512",
-"filename": "jimdb-x86-pie-linux_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2263182,
+    "visibility": "public",
+    "digest": "24711d54143978caa77c5db54fc7da142c82c827a9bbbfad0a133ed30440e9a46b7e7fcd9ade886dbc5f0d7cd11a4facb3aeb573303becf6169234edef6f84e9",
+    "algorithm": "sha512",
+    "filename": "jimdb-x86-pie-linux_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/jimdb-x86.manifest
+++ b/testing/config/tooltool-manifests/linux64/jimdb-x86.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2097036,
-"visibility": "public",
-"digest": "46064b4e0526d7bc78bb5d0ca1595738013663e43d8673f4b868ec1a549a8012f2759cbed9e0e15a11b38a3dea4ea7292a58b05a5b919cf64894760dd27e50a2",
-"algorithm": "sha512",
-"filename": "jimdb-x86-linux_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2097036,
+    "visibility": "public",
+    "digest": "46064b4e0526d7bc78bb5d0ca1595738013663e43d8673f4b868ec1a549a8012f2759cbed9e0e15a11b38a3dea4ea7292a58b05a5b919cf64894760dd27e50a2",
+    "algorithm": "sha512",
+    "filename": "jimdb-x86-linux_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/nodejs.manifest
+++ b/testing/config/tooltool-manifests/linux64/nodejs.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 13958999,
-"visibility": "internal",
-"digest": "ce5c0c20dfa83821284a1b69b226fe13224b82345622fc43d216332484ec8c89a2f171ad3dd2ac83cd5777510306d349bc4fbf00fc692e3542dfb7db70876489",
-"algorithm": "sha512",
-"filename": "node-linux-x64.tar.gz",
-"unpack": true
-}
+  {
+    "size": 13958999,
+    "visibility": "internal",
+    "digest": "ce5c0c20dfa83821284a1b69b226fe13224b82345622fc43d216332484ec8c89a2f171ad3dd2ac83cd5777510306d349bc4fbf00fc692e3542dfb7db70876489",
+    "algorithm": "sha512",
+    "filename": "node-linux-x64.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/linux64/releng.manifest
+++ b/testing/config/tooltool-manifests/linux64/releng.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 1737944,
-"visibility": "public",
-"digest": "76d704f0bfa110f5ea298b87200e34ec09d039b9d1a59ec819fc8e02b2cf073af32a4536dca33a3813f037a557fd0669b48a063c7a920f6308b307148029d41f",
-"algorithm": "sha512",
-"filename": "linux64-minidump_stackwalk"
-}
+  {
+    "size": 1737944,
+    "visibility": "public",
+    "digest": "76d704f0bfa110f5ea298b87200e34ec09d039b9d1a59ec819fc8e02b2cf073af32a4536dca33a3813f037a557fd0669b48a063c7a920f6308b307148029d41f",
+    "algorithm": "sha512",
+    "filename": "linux64-minidump_stackwalk"
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/hostutils.manifest
+++ b/testing/config/tooltool-manifests/macosx64/hostutils.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 121025970,
-"visibility": "public",
-"digest": "1374f461ad90fcdf1f6859df56379f000c7dbb0f8ea54c6652472c9e6f25052ec2386d00d6a41ed55579060e9300886674363f9689b1391e44518e500b9f2681",
-"algorithm": "sha512",
-"filename": "host-utils-50.0a2.en-US.mac.tar.gz",
-"unpack": true
-}
+  {
+    "size": 121025970,
+    "visibility": "public",
+    "digest": "1374f461ad90fcdf1f6859df56379f000c7dbb0f8ea54c6652472c9e6f25052ec2386d00d6a41ed55579060e9300886674363f9689b1391e44518e500b9f2681",
+    "algorithm": "sha512",
+    "filename": "host-utils-50.0a2.en-US.mac.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/jimdb-arm-pie.manifest
+++ b/testing/config/tooltool-manifests/macosx64/jimdb-arm-pie.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 1878317,
-"visibility": "public",
-"digest": "bb15c6060582701dd1f10b2a82e38185f30dc072299e54829965d57c7772f002cd45dafe3889a63412d2b72fb56e4a07280a8b9a4d00c756eaf059da74bfe18f",
-"algorithm": "sha512",
-"filename": "jimdb-arm-pie-mac_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 1878317,
+    "visibility": "public",
+    "digest": "bb15c6060582701dd1f10b2a82e38185f30dc072299e54829965d57c7772f002cd45dafe3889a63412d2b72fb56e4a07280a8b9a4d00c756eaf059da74bfe18f",
+    "algorithm": "sha512",
+    "filename": "jimdb-arm-pie-mac_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/jimdb-arm.manifest
+++ b/testing/config/tooltool-manifests/macosx64/jimdb-arm.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 1870546,
-"visibility": "public",
-"digest": "57082b39169e23746db762b10e3a606d86511096724783b3ae747c4570cf469ab7e6d7ae636c3454113c1d68c3b6554a93217908ce141e76f877d84011f0098a",
-"algorithm": "sha512",
-"filename": "jimdb-arm-mac_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 1870546,
+    "visibility": "public",
+    "digest": "57082b39169e23746db762b10e3a606d86511096724783b3ae747c4570cf469ab7e6d7ae636c3454113c1d68c3b6554a93217908ce141e76f877d84011f0098a",
+    "algorithm": "sha512",
+    "filename": "jimdb-arm-mac_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/jimdb-x86-pie.manifest
+++ b/testing/config/tooltool-manifests/macosx64/jimdb-x86-pie.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 2105007,
-"visibility": "public",
-"digest": "e1d86b076f686dcd9dada92a0d0c9a8fca9ac2311017b214713d9f314fa65123a97e997c5c8fdf90c1579cd7be66b2069314c7e193c80081855af531b804c3c0",
-"algorithm": "sha512",
-"filename": "jimdb-x86-pie-mac_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 2105007,
+    "visibility": "public",
+    "digest": "e1d86b076f686dcd9dada92a0d0c9a8fca9ac2311017b214713d9f314fa65123a97e997c5c8fdf90c1579cd7be66b2069314c7e193c80081855af531b804c3c0",
+    "algorithm": "sha512",
+    "filename": "jimdb-x86-pie-mac_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/jimdb-x86.manifest
+++ b/testing/config/tooltool-manifests/macosx64/jimdb-x86.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 1958623,
-"visibility": "public",
-"digest": "0f2d4837eb25412800438dbe87a87f6ef38d4d92379f987e5f1e524ff9ec0c783386789f6a0e15b99e6a443326170cca1bf71e80d016971af3e1371e5b1e9d2d",
-"algorithm": "sha512",
-"filename": "jimdb-x86-mac_x64.tar.bz2",
-"unpack": true
-}
+  {
+    "size": 1958623,
+    "visibility": "public",
+    "digest": "0f2d4837eb25412800438dbe87a87f6ef38d4d92379f987e5f1e524ff9ec0c783386789f6a0e15b99e6a443326170cca1bf71e80d016971af3e1371e5b1e9d2d",
+    "algorithm": "sha512",
+    "filename": "jimdb-x86-mac_x64.tar.bz2",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/nodejs.manifest
+++ b/testing/config/tooltool-manifests/macosx64/nodejs.manifest
@@ -1,10 +1,10 @@
 [
-{
-"size": 12148545,
-"visibility": "internal",
-"digest": "a79b5efc30b560fbfb48210b4e0b4c6418ebc8472b07460c7cb2042db6ea1b7a6473cb9fa35604b8abbc93df3d3689b91919dd21e8d4f382033d3c07c7ec6a3f",
-"algorithm": "sha512",
-"filename": "node-osx.tar.gz",
-"unpack": true
-}
+  {
+    "size": 12148545,
+    "visibility": "internal",
+    "digest": "a79b5efc30b560fbfb48210b4e0b4c6418ebc8472b07460c7cb2042db6ea1b7a6473cb9fa35604b8abbc93df3d3689b91919dd21e8d4f382033d3c07c7ec6a3f",
+    "algorithm": "sha512",
+    "filename": "node-osx.tar.gz",
+    "unpack": true
+  }
 ]
--- a/testing/config/tooltool-manifests/macosx64/releng.manifest
+++ b/testing/config/tooltool-manifests/macosx64/releng.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 862324,
-"visibility": "public",
-"digest": "681cf3906b294c05bdc3271e3fad0f964372a3208dc42e0fea032d194cb480239e32a5cb898d2297614c9a55afe9aa9e06797e52c8c775c67b6c4e09396b957b",
-"algorithm": "sha512",
-"filename": "macosx64-minidump_stackwalk"
-}
+  {
+    "size": 862324,
+    "visibility": "public",
+    "digest": "681cf3906b294c05bdc3271e3fad0f964372a3208dc42e0fea032d194cb480239e32a5cb898d2297614c9a55afe9aa9e06797e52c8c775c67b6c4e09396b957b",
+    "algorithm": "sha512",
+    "filename": "macosx64-minidump_stackwalk"
+  }
 ]
--- a/testing/config/tooltool-manifests/win32/nodejs.manifest
+++ b/testing/config/tooltool-manifests/win32/nodejs.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 15066656,
-"visibility": "internal",
-"digest": "edf96781042db513700c4a092ef367c05933967b036db9b0f716b75da613a7eaea055d0f60b1e12f6e41a545962cec97a7b78c6b86363ee1ec7a9f42699a5531",
-"algorithm": "sha512",
-"filename": "node-win32.exe"
-}
+  {
+    "size": 15066656,
+    "visibility": "internal",
+    "digest": "edf96781042db513700c4a092ef367c05933967b036db9b0f716b75da613a7eaea055d0f60b1e12f6e41a545962cec97a7b78c6b86363ee1ec7a9f42699a5531",
+    "algorithm": "sha512",
+    "filename": "node-win32.exe"
+  }
 ]
--- a/testing/config/tooltool-manifests/win32/releng.manifest
+++ b/testing/config/tooltool-manifests/win32/releng.manifest
@@ -1,9 +1,9 @@
 [
-{
-"size": 1516544,
-"visibility": "public",
-"digest": "cf84f9592059f1e0756370f44e0ad289b71569c235d2ec8c5958695cc57352d3b99b584fd119e73fc9593d1c4cca414985e71f567f777162471b6040ebc59d13",
-"algorithm": "sha512",
-"filename": "win32-minidump_stackwalk.exe"
-}
+  {
+    "size": 1516544,
+    "visibility": "public",
+    "digest": "cf84f9592059f1e0756370f44e0ad289b71569c235d2ec8c5958695cc57352d3b99b584fd119e73fc9593d1c4cca414985e71f567f777162471b6040ebc59d13",
+    "algorithm": "sha512",
+    "filename": "win32-minidump_stackwalk.exe"
+  }
 ]