Merge #11713: Fix for mismatched extern definition in wallet tests