Bug 1074832 - CacheIndex merges journal with pending updates incorrectly, r=honzab