TRUNK-4020 AddressTemplate should let a user specify required fields