Merge "Rename cluster-e2etest to cluster-icn"