Changed util.deepMerge to allow null values to override other values