Issue #23222743: Re-merge in Drupal Contributions field instance.
Merge branch '2060691-migrate-mentor-field' into 2322273-migrate-drupal-contributions

Conflicts:
	features/drupalorg_user/drupalorg_user.features.field_instance.inc
	features/drupalorg_user/drupalorg_user.field_group.inc
	features/drupalorg_user/drupalorg_user.info
Merge branch '7.x-3.x' into 2322273-migrate-drupal-contributions
Issue #2322273: Re-migrate Drupal Contributions user field.