TRUNK-4020: AddressTemplate should let a user specify required fields
Merge pull request #1032 from pmuchowski/TRUNK-4020

TRUNK-4020: AddressTemplate should let a user specify required fields