Make MergebaleJMapStore conform to new API
Merge pull request #168 from twitter/generic-jmap-merge

Make MergebaleJMapStore conform to new API