Fix for edge mode

Change-Id: I45a389623e840c0707c65393a9157c38896d83b6
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing
Dump local machine's arp cache for instance ip if ssh connection fails
Merge branch 'testing' of git.qa1.eucalyptus-systems.com:qa-repos/eutester into testing