1e3ed06a9a
Changing correlation_id_map to static instance instead of being a pointer and fixing the corresponding references Change-Id: Id8a481a90b46831f91985a7e0523fd2869991aeb