diff -crB ./dsc.original/LCM/codec/mof/parser/types.c ./dsc/LCM/codec/mof/parser/types.c
*** ./dsc.original/LCM/codec/mof/parser/types.c	Fri Mar  6 20:58:39 2015
--- ./dsc/LCM/codec/mof/parser/types.c	Fri Mar 13 20:07:07 2015
***************
*** 3217,3223 ****
          /* Set NULL flag to property */
          if (!(pd->flags & MI_FLAG_NULL) && !pd->value)
          {
!             pd->flags |= MI_FLAG_NULL;
          }
  
          /* See if the property is already in the list */
--- 3217,3224 ----
          /* Set NULL flag to property */
          if (!(pd->flags & MI_FLAG_NULL) && !pd->value)
          {
!         //commenting for arrary's issue suggested by MSFT - DELL
!         //    pd->flags |= MI_FLAG_NULL;
          }
  
          /* See if the property is already in the list */
diff -crB ./dsc.original/LCM/config.mak ./dsc/LCM/config.mak
*** ./dsc.original/LCM/config.mak	Fri Mar  6 20:58:39 2015
--- ./dsc/LCM/config.mak	Tue Mar 10 10:02:23 2015
***************
*** 1,4 ****
! OMI = $(TOP)/../omi-1.0.8
  OUTPUTDIR = $(OMI)/output
  
  include $(OMI)/config.mak
--- 1,4 ----
! OMI = $(TOP)/../../omi-1.0.8
  OUTPUTDIR = $(OMI)/output
  
  include $(OMI)/config.mak
diff -crB ./dsc.original/LCM/dsc/common/inc/OMI_Error.h ./dsc/LCM/dsc/common/inc/OMI_Error.h
*** ./dsc.original/LCM/dsc/common/inc/OMI_Error.h	Fri Mar  6 20:58:40 2015
--- ./dsc/LCM/dsc/common/inc/OMI_Error.h	Tue Mar 10 10:01:20 2015
***************
*** 45,50 ****
--- 45,51 ----
      MI_ConstUint32Field error_Code;
      MI_ConstStringField error_Type;
      MI_ConstUint16Field error_Category;
+     MI_ConstStringField OMI_ErrorMessage;
  }
  OMI_Error;
  
diff -crB ./dsc.original/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c ./dsc/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c
*** ./dsc.original/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c	Fri Mar  6 20:58:40 2015
--- ./dsc/LCM/dsc/engine/ConfigurationManager/OMI_LocalConfigManagerHelper.c	Tue Mar 10 10:01:19 2015
***************
*** 212,218 ****
  
  	do {
  		ch = fgetc(stream);
! 		if (ch == EOF)
  			break;
  		if (length + 1 >= allocated)
  		{
--- 212,218 ----
  
  	do {
  		ch = fgetc(stream);
! 		if (ch == (char)EOF)
  			break;
  		if (length + 1 >= allocated)
  		{
diff -crB ./dsc.original/LCM/dsc/engine/ConfigurationManager/omi_schema.c ./dsc/LCM/dsc/engine/ConfigurationManager/omi_schema.c
*** ./dsc.original/LCM/dsc/engine/ConfigurationManager/omi_schema.c	Fri Mar  6 20:58:40 2015
--- ./dsc/LCM/dsc/engine/ConfigurationManager/omi_schema.c	Tue Mar 10 10:01:19 2015
***************
*** 4978,4983 ****
--- 4978,4999 ----
      NULL,
  };
  
+ static MI_CONST MI_PropertyDecl OMI_Error_OMI_ErrorMessage_prop =
+ {
+     MI_FLAG_PROPERTY, /* flags */
+     0x006F6510, /* code */
+     MI_T("OMI_ErrorMessage"), /* name */
+     NULL, /* qualifiers */
+     0, /* numQualifiers */
+     MI_STRING, /* type */
+     NULL, /* className */
+     0, /* subscript */
+     offsetof(OMI_Error, OMI_ErrorMessage), /* offset */
+     MI_T("OMI_Error"), /* origin */
+     MI_T("OMI_Error"), /* propagator */
+     NULL,
+ };
+ 
  static MI_PropertyDecl MI_CONST* MI_CONST OMI_Error_props[] =
  {
      &CIM_Error_ErrorType_prop,
***************
*** 4998,5003 ****
--- 5014,5020 ----
      &OMI_Error_error_Code_prop,
      &OMI_Error_error_Type_prop,
      &OMI_Error_error_Category_prop,
+     &OMI_Error_OMI_ErrorMessage_prop,
  };
  
  static MI_CONST MI_Boolean OMI_Error_Indication_qual_value = 1;
diff -crB ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c ./dsc/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c
*** ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c	Fri Mar  6 20:58:40 2015
--- ./dsc/LCM/dsc/engine/ConsistencyInvoker/ConsistencyInvoker.c	Tue Mar 10 10:01:19 2015
***************
*** 32,38 ****
  #if defined(_MSC_VER)
  #define DSCENGINE_NAMESPACE MI_T("root\\microsoft\\windows\\desiredstateconfiguration")
  #else
! #define DSCENGINE_NAMESPACE MI_T("/dsc")
  #endif
  
  int main(int argc, char *argv[])
--- 32,38 ----
  #if defined(_MSC_VER)
  #define DSCENGINE_NAMESPACE MI_T("root\\microsoft\\windows\\desiredstateconfiguration")
  #else
! #define DSCENGINE_NAMESPACE MI_T("root/Microsoft/Windows/DesiredStateConfiguration")
  #endif
  
  int main(int argc, char *argv[])
diff -crB ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile ./dsc/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile
*** ./dsc.original/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile	Fri Mar  6 20:58:40 2015
--- ./dsc/LCM/dsc/engine/ConsistencyInvoker/GNUmakefile	Tue Mar 10 10:01:19 2015
***************
*** 2,8 ****
  TOP = ../../..
  include $(TOP)/config.mak
  
! CPROGRAM = consistencyinvoker
  SOURCES = ConsistencyInvoker.c
  
  INCLUDES = $(OMI) $(OMI)/common $(TOP)/codec/common $(OMI)/nits/base $(DSCTOP)/common/inc $(DSCTOP)/engine/EngineHelper 
--- 2,8 ----
  TOP = ../../..
  include $(TOP)/config.mak
  
! CPROGRAM = ConsistencyInvoker
  SOURCES = ConsistencyInvoker.c
  
  INCLUDES = $(OMI) $(OMI)/common $(TOP)/codec/common $(OMI)/nits/base $(DSCTOP)/common/inc $(DSCTOP)/engine/EngineHelper 
diff -crB ./dsc.original/LCM/omiutils/OMI_Error.h ./dsc/LCM/omiutils/OMI_Error.h
*** ./dsc.original/LCM/omiutils/OMI_Error.h	Fri Mar  6 20:58:44 2015
--- ./dsc/LCM/omiutils/OMI_Error.h	Tue Mar 10 10:01:20 2015
***************
*** 45,50 ****
--- 45,51 ----
      MI_ConstUint32Field error_Code;
      MI_ConstStringField error_Type;
      MI_ConstUint16Field error_Category;
+     MI_ConstStringField OMI_ErrorMessage;
  }
  OMI_Error;
  
diff -crB ./dsc.original/LCM/omiutils/errors.c ./dsc/LCM/omiutils/errors.c
*** ./dsc.original/LCM/omiutils/errors.c	Fri Mar  6 20:58:44 2015
--- ./dsc/LCM/omiutils/errors.c	Tue Mar 10 10:01:20 2015
***************
*** 1632,1637 ****
--- 1632,1653 ----
      NULL,
  };
  
+ static MI_CONST MI_PropertyDecl OMI_Error_OMI_ErrorMessage_prop =
+ {
+     MI_FLAG_PROPERTY, /* flags */
+     0x006F6510, /* code */
+     MI_T("OMI_ErrorMessage"), /* name */
+     NULL, /* qualifiers */
+     0, /* numQualifiers */
+     MI_STRING, /* type */
+     NULL, /* className */
+     0, /* subscript */
+     offsetof(OMI_Error, OMI_ErrorMessage), /* offset */
+     MI_T("OMI_Error"), /* origin */
+     MI_T("OMI_Error"), /* propagator */
+     NULL,
+ };
+ 
  static MI_PropertyDecl MI_CONST* MI_CONST OMI_Error_props[] =
  {
      &CIM_Error_ErrorType_prop,
***************
*** 1652,1657 ****
--- 1668,1674 ----
      &OMI_Error_error_Code_prop,
      &OMI_Error_error_Type_prop,
      &OMI_Error_error_Category_prop,
+     &OMI_Error_OMI_ErrorMessage_prop,
  };
  
  static MI_CONST MI_Boolean OMI_Error_Indication_qual_value = 1;
diff -crB ./dsc.original/Providers/Makefile ./dsc/Providers/Makefile
*** ./dsc.original/Providers/Makefile	Fri Mar  6 20:58:44 2015
--- ./dsc/Providers/Makefile	Tue Mar 10 10:03:56 2015
***************
*** 7,13 ****
  
  # Please define the variables below for your system!
  
! OMI_DIR := $(shell cd ../omi-1.0.8; pwd)
  BASE_DIR := $(shell pwd)
  TARGET_DIR := $(BASE_DIR)/target
  
--- 7,13 ----
  
  # Please define the variables below for your system!
  
! OMI_DIR := $(shell cd ../../omi-1.0.8; pwd)
  BASE_DIR := $(shell pwd)
  TARGET_DIR := $(BASE_DIR)/target
  
diff -crB ./dsc.original/Providers/PythonHelper/PythonHelper.cpp ./dsc/Providers/PythonHelper/PythonHelper.cpp
*** ./dsc.original/Providers/PythonHelper/PythonHelper.cpp	Fri Mar  6 20:58:44 2015
--- ./dsc/Providers/PythonHelper/PythonHelper.cpp	Tue Mar 10 10:01:36 2015
***************
*** 370,382 ****
      std::string scriptPath;
      if (sPath == NULL)
      {
!         std::cerr << "Error: Expected environment variable OMI_HOME is not defined.  Looking up scripts in /opt/omi-1.0.8/lib/Scripts" << std::endl;
!         scriptPath = "/opt/omi-1.0.8";
      }
      else
      {
          scriptPath = sPath;
      }
!     scriptPath += "/lib/Scripts";
      return scriptPath;
  }
--- 370,382 ----
      std::string scriptPath;
      if (sPath == NULL)
      {
!         std::cerr << "Error: Expected environment variable OMI_HOME is not defined.  Looking up scripts in /usr/pkg/omi108/scripts" << std::endl;
!         scriptPath = "/usr/pkg/omi108";
      }
      else
      {
          scriptPath = sPath;
      }
!     scriptPath += "/scripts";
      return scriptPath;
  }
diff -crB ./dsc.original/LCM/dsc/engine/EngineHelper/EventWrapper.c ./dsc/LCM/dsc/engine/EngineHelper/EventWrapper.c
*** ./dsc.original/LCM/dsc/engine/EngineHelper/EventWrapper.c   Fri Mar  6 20:58:40 2015
--- ./dsc/LCM/dsc/engine/EngineHelper/EventWrapper.c    Wed Apr 22 02:54:07 2015
***************
*** 70,79 ****
 
  static int _GetDSCTimeStamp(_Pre_writable_size_(TIMESTAMP_SIZE) char buf[TIMESTAMP_SIZE])
  {
-     MI_Uint64 usec = (MI_Uint64) CPU_GetTimeStamp();
-     time_t t = usec / 1000000;
      struct tm tm;
!     localtime_r(&t, &tm);
      sprintf(
          buf,
          "%02u/%02u/%02u %02u:%02u:%02u",
--- 70,79 ----
 
  static int _GetDSCTimeStamp(_Pre_writable_size_(TIMESTAMP_SIZE) char buf[TIMESTAMP_SIZE]) 
  { 
      struct tm tm;
!     time_t ltime;
!     ltime = time(NULL);
!     localtime_r(&ltime, &tm);
      sprintf(
          buf,
          "%02u/%02u/%02u %02u:%02u:%02u",