Contact Summary : Map this Address link missing location (lid) parameter

NOTE: This is a regression bug - tested the same case in 1.9 and it works properly.

If a contact has more than one address, and mapping is enabled - clicking the "Map this Address" link for an address OTHER THAN the primary address attempts to map the primary address. This is almost certainly due to the fact that the lid= parameter is empty in the link. Example:

http://drupal-demo.civicrm.org/civicrm/contact/map?reset=1&cid=102&lid=

Tabbed.tpl has this code for the link query string:
q="reset=1&cid=$contactId&lid=`$loc.address.location_id`"

... however, the address array does NOT have a location_id any longer.

===========

As a side-effect of this bug...if the non-primary address is "mappable" and the primary location does not have a mappable address - you get this error:
"This contact's primary address does not contain latitude/longitude information and can not be mapped."
... despite the fact that the non-primary address DOES have latitude and longitude data.