CRM-14856 - Fix regressions in Drupal-Profile integration