fix issue with merge handling null values
Merge pull request #93 from zenoss/bugfix/CC-25-2

fix issue with merge handling null values

ian. he is responsible for this.