#2332475 Add user field for ToS agreement
#2332475 Use a warning message for existing users
#2333517 Change cancel button to a link.
Rebase cleanup
Issue #2332475: Merge branch '7.x-3.x' into 2332475-tos

Conflicts:
	drupalorg/drupalorg.module
	features/drupalorg_user/drupalorg_user.features.field_instance.inc
Issue #2332475 Update URL.
Features re-export.
Issue #2332475: Merge branch '2332475-tos' into 7.x-3.x

Conflicts:
	features/drupalorg_user/drupalorg_user.features.field_instance.inc