TRUNK-4020 AddressTemplate should let a user specify required fields
Merge pull request #1 from Pakul/TRUNK-4020

 TRUNK-4020 AddressTemplate should let a user specify required fields