Endpoint type elements related to custom xml are deleted upon deletion of...

Endpoint type elements related to custom xml are deleted upon deletion of custom xml for a given session (#1531)

- Added tests to verify