Merge pull request #220 from DavidMikeSimon/master

Additional debugging information in mergeResources
In UriContentSubscriber, no longer trying to merge from null data