fix the update to 2.3.4+

Moodle made changes to the user profile API in v2.3.4.
This created conflicts and forced a light change in custominfo's API.

The (currently unused) new class profile_field_base hasn't been
ported yet.

Conflicts:
	course/edit_form.php