switch to using instance ID to compute mac address instead of private IP to compute mac address in order to preserve network interface config when instances are stopped/started (EUCA-8780).  Clarify some logging messages (EUCA-8816).
Merge branch 'testing' into team/network/edge