#2333517 Change cancel button to a link.

Conflicts:
	drupalorg/drupalorg.module
#2333517 Make cancel button more distinct from cancel link.