fixing merge conflicts in SqlControllerTest CreateCheckListSite
fixing merge conflicts in SqlControllerTest CreateCheckListSite

microting/eFormCSharp2,microting/eFormCSharp2,microting/eform-sdk-dotnet,microting/eform-sdk-dotnet