Fixed issue #88: Merge into master

Conflicts:

	src/SAFplus/components/event/server/clEvtServerMain.c