Borislav has flagged differences between the branches (we need to figure out what these are) - changes have been done to oom that were not retrofitted to logging-analytics and vice versa - also changes were done in amsterdam oom or beijing oom that should have been retrofitted in the reverse direction need to also be determined

do a diff and determine

1 - what is in Amsterdam that should be in Beijing

2 - what is in Beijing that should be in Amsterdam

3 - what the real specification should be going forward

see the removed reference spec in master that was causing difficulties determining whether the oom or logging-analytics repo is the real logging spec.