Continued refinement of Xots
Merge remote-tracking branch 'openntf/nathan' into roland

Conflicts:
	org.openntf.domino.xsp/src/org/openntf/domino/xots/XotsDaemon.java