Fix issue where we can SSH from inside the instance to cluster using instance public IP
EUCA-9690
Fix typo
Merge branch 'dev/chuck/9690-40' into maint/4.0/testing

Conflicts:
	net/vnetwork.c