Merge remote-tracking branch 'origin/develop' into ETCM-165-separate-rlp-sbt-project

Author: aakoshh

src/main/resources/chains/testnet-internal-nomad-chain.conf

@@ -84,7 +84,7 @@
 
     # Proto-treasury fork block number (ETC only, but deactivated for now)
     # https://ecips.ethereumclassic.org/ECIPs/ecip-1098
-    treasury-address = "0011223344556677889900112233445566778899"
+    treasury-address = "0358e65dfe67b350eb827ffa17a82e7bb5f4c0c6"
     ecip1098-block-number = "0"
 
     # Checkpointing fork block number