CLDCONNECT-1525: Enable invalidate connection mechanism
(cherry picked from commit f83ce97)
Merged fix of CLDCONNECT-1193 with master