Merge 3172615d2c into merged_master (Elements PR ElementsProject/elements#986)

Note: up to this point I still had the old "sort by UNIX timestamp"
behavior on, which may have meant that some PRs were merged out of
order (i.e. multiple merged at once, followed by no-op merges). I
turned this off, and now just use git's default topo-sort (and manually
switch between Elements merges and Bitcoin merges).

src/validation.cpp

@@ -1951,6 +1951,15 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
         }
     }
 
+    // Undo default signalling behavior for dynafed unless explicitly enabled.
+    if (!gArgs.GetBoolArg("-con_dyna_deploy_signal", false)) {
+        auto dynafed = Consensus::DeploymentPos::DEPLOYMENT_DYNA_FED;
+        int bit = params.vDeployments[dynafed].bit;
+        if (bit > 0 && bit < VERSIONBITS_NUM_BITS) {
+            nVersion &= ~VersionBitsMask(params, dynafed);
+        }
+    }
+
     return nVersion;
 }