EUCA-8906 - De-register/Re-register of Cluster with Different Name Doesn't Work
Merge remote-tracking branch 'origin/testing' into testing