Relaxed comparison of operation_id and (in some tests) next_operation_id fields.

First part of changes. Still 8 tests are failing, but going to deliver it to develop to merge HAF MR