Fix production conflict auto-resolve

[isc-tleavitt]

Example of merge conflict:

<<<<<<< src/HCC/Connect/Production.cls
  <Item Name="PreReleaseSample1" Category="" ClassName="EnsLib.MsgRouter.RoutingEngine" PoolSize="1" Enabled="false" Foreground="false" Comment="" LogTraceEvents="false" Schedule="">
    <Setting Target="Host" Name="BusinessRuleName">HCC.Foo.PrereleaseSample1</Setting>
=======
  <Item Name="PrereleaseTesting2" Category="" ClassName="EnsLib.HL7.Service.FileService" PoolSize="1" Enabled="false" Foreground="false" Comment="" LogTraceEvents="false" Schedule="">
>>>>>>> src/HCC/Connect/Production.cls
  </Item>

Should resolve to:

  <Item Name="PreReleaseSample1" Category="" ClassName="EnsLib.MsgRouter.RoutingEngine" PoolSize="1" Enabled="false" Foreground="false" Comment="" LogTraceEvents="false" Schedule="">
    <Setting Target="Host" Name="BusinessRuleName">HCC.Foo.PrereleaseSample1</Setting>
  </Item>
  <Item Name="PrereleaseTesting2" Category="" ClassName="EnsLib.HL7.Service.FileService" PoolSize="1" Enabled="false" Foreground="false" Comment="" LogTraceEvents="false" Schedule="">
  </Item>

[isc-tleavitt]

In some TDD I'm getting the merge resolved automatically in the example case, which is weird because it definitely errored along these lines in our HCC deployment.

[isc-tleavitt]

Oof - this is actually a larger bug in our production conflict auto-resolution, because we added sync output to the log and that's making it look like more than a simple conflict.