CRM-15691 fix for Mailing Labels pulling incorrect address when location type other than Home or Primary requested
optimised modification
Merge pull request #4675 from jitendrapurohit/CRM-15691

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