Update to address module with uw patch.

Merged Igor Biki requested to merge feature-ibiki-address-fix into 3.1.x

Merge request reports