CONN-1205: TrustBundle association and disassociation bug fixes