Merge remote-tracking branch 'origin/alex' into manfred

Conflicts:
	domino/core/src/org/openntf/domino/xots/XotsDaemon.java
	domino/xsp/src/org/openntf/domino/xsp/xots/XotsDominoExecutor.java
comment
Merge remote-tracking branch 'origin/alex' into manfred
Merge remote-tracking branch 'origin/manfred' into roland

Conflicts:
	domino/core/src/org/openntf/domino/xots/XotsDaemon.java
	domino/xsp/src/org/openntf/domino/xsp/helpers/OpenntfFactoryInitializer.java
	domino/xsp/src/org/openntf/domino/xsp/xots/XotsDominoExecutor.java