CRM-15691 fix for Mailing Labels pulling incorrect address when location...

... type other than Home or Primary requested