Fixing health statistics events, stream definitions, event publishers with cluster_instance_id attribute change
Fixing compilation issues caused by the recent rebase