Fix issue where instance can SSH into CC using their public IP
EUCA-9690
Merge branch 'dev/chuck/9690-41' into testing