NMS-5804 fix empty geolocation string when address1 is not specified
Merge branch 'rc/unstable/1.11.90' into 1.12
Merge branch '1.12'