Major updates integration from all upstreams

src/komodo_utils.h

@@ -1643,9 +1643,10 @@ uint64_t komodo_ac_block_subsidy(int nHeight)
     return(subsidy);
 }
 
+extern int64_t MAX_MONEY;
+
 void komodo_args(char *argv0)
 {
-    extern int64_t MAX_MONEY;
     extern const char *Notaries_elected1[][2];
     std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4],extrabuf[256],*extraptr=0; FILE *fp; uint64_t val; uint16_t port; int32_t i,baseid,len,n,extralen = 0;
     IS_KOMODO_NOTARY = GetBoolArg("-notary", false);