Merge "Heat: use first_address instead of first_private_address"