Lsm merge simplify

Refs #1368

Shuffle LSM merge code so error handling is a bit simpler, and handle bloom creation consistently.