Updating with the latest changes in production.
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
Committing production specific changes
Merge branch '7.x-4.2.6-1.0-prod' of github.com:aar/civicrm_multi_payments into 7.x-4.2.6-1.0-prod
Merge remote-tracking branch 'remotes/origin/7.x-4.2.6-1.x-oasis-549' into 7.x-4.2.6-2.x