Major updates integration from all upstreams

src/deprecation.h

@@ -18,8 +18,11 @@ static const int DEPRECATION_WARN_LIMIT = 60 * 24 * 60; // 2 months
 /**
  * Checks whether the node is deprecated based on the current block height, and
  * shuts down the node with an error if so (and deprecation is not disabled for
- * the current client version).
+ * the current client version). Warning and error messages are sent to the debug
+ * log, the metrics UI, and (if configured) -alertnofity.
+ *
+ * fThread means run -alertnotify in a free-running thread.
  */
-void EnforceNodeDeprecation(int nHeight, bool forceLogging=false);
+void EnforceNodeDeprecation(int nHeight, bool forceLogging=false, bool fThread=true);
 
 #endif // ZCASH_DEPRECATION_H