OAK-8538: Incomplete recovery on long running merge with branch commits Detect branch commits on recovery and enable tests