Make the retry_include_ip_address smtp transport option expanded. Bug 1545