Allow use of Address v2.

Damien McKennarequested to merge
issue/salesforce-3414401:3414401-address2 into 5.0.x

Closes #3414401

Merge request reports