NXCALS-1180-entity-corrupted

#Merge request template @acc-logging-team - please have a look for approval.

This is a fix for the corruption of the entities. Please accept.

It also fixes a potential NPE and resource leak in AbstractFactoryClient on the body handling.