Revert "Merge branch 'event_monitor' of git://github.com/ankitagarwal/moodle into master-proposed"

This reverts commit 00ef5084ec82d52832bd29df56e9efd0eb1d79a2, reversing
changes made to 877eed9bc2182b64b90dc3889a61f46262a5559f.

Conflicts:
	lib/upgrade.txt