Bug: 12180 Standardize on imaddress fields.

Signed-off-by: Michael J Rubinsky <mrubinsk@horde.org>