move the cluster connection out. AIRAVATA-1456