(#635) - merge_rev_tree tests now support availability

That's quite to much said as they don't check if the availability
is merged correctly.
(#635) - make merging status less explicit

If we merge statuses {} and {} we now get {} and not {status: missing}