sync with master & resolve conflicts.

Author: NRHelmi

DelveClientSDK/Connection.cs

@@ -374,13 +374,12 @@ public ICollection<AbstractProblem> CollectProblems()
         public bool Configure(
             bool? debug = null,
             bool? debugTrace = null,
-            bool? broken = null,
             bool? silent = null,
             bool? abortOnError = null
         )
         {
             SetConnectionOnClients();
-            return Client.Configure(debug, debugTrace, broken, silent, abortOnError);
+            return Client.Configure(debug, debugTrace, silent, abortOnError);
         }
 
         public bool Status()

DelveClientSDK/DelveClient.cs

@@ -948,15 +948,13 @@ public ICollection<AbstractProblem> CollectProblems()
         public bool Configure(
             bool? debug = null,
             bool? debugTrace = null,
-            bool? broken = null,
             bool? silent = null,
             bool? abortOnError = null
         )
         {
             var action = new SetOptionsAction();
             action.Debug = debug;
             action.Debug_trace = debugTrace;
-            action.Broken = broken;
             action.Silent = silent;
             action.Abort_on_error = abortOnError;
             return RunAction(action, isReadOnly: false) != null;