Fix for hostname metadata node to return private hostname
Merge remote-tracking branch 'origin/testing' into testing