Fix DI injection of the OAuthTokenFactory.

Conflicts:
	Resources/config/oauth.xml
Merge remote-tracking branch 'origin/token-override' into orocrm