Add ability to add and remove observable events
Additional tests and bugfix
Uncomment out test
Merge pull request #5040 from dwightwatson/4.2

Add ability to add and remove observable events