Fix for Primary Location type issue on Drupal pages in issue: aar/OASIS#549
Using dynmic lookup for Primary Location type. Issue: aar/OASIS#549
Merge branch '7.x-4.2.6-1.x-oasis-549' into 7.x-4.2.6-1.x

Conflicts:
	CRM/Core/BAO/UFGroup.php