qualify $hostname and $ipaddress references

Change-Id: I09996208bfa40b7a3435ff4a791bc00f5f713eb7