Untracked issue: preventing ConcurrentModificationException when using Apache Client Connector

Change-Id: Ifba99afd8e298c657737d1b37be7ac7c0f503f13