Merge branch 'dev' into flap_fix

src/ripple/app/hook/impl/applyHook.cpp

@@ -3577,7 +3577,7 @@ DEFINE_HOOK_FUNCTION(
     {
         JLOG(j.trace()) << "HookEmit[" << HC_ACC()
                         << "]: Transaction preflight failure: "
-                        << preflightResult.ter;
+                        << transHuman(preflightResult.ter);
         return EMISSION_FAILURE;
     }
 

src/test/app/MultiSign_test.cpp

@@ -1675,7 +1675,6 @@ public:
             env.fund(XRP(1000), alice);
             env.close();
 
-            bool const enabled = features[fixInvalidTxFlags];
             testcase(
                 std::string("SignerListSet flag, fix ") +
                 (withFixInvalidTxFlags ? "enabled" : "disabled"));