Closes getlantern/lantern#1766

Essentially.  The merge rules actually depend a little on what type of data we're dealing with.  In the case of a map, the effect is cumulative, which is to say that all keys from updateBytes and updated will be present in the final updated.