Extract the creation of the OAuthToken class in a separate method of the OAuthProvider.
Create a Factory and integrate it in the existing code.
Merge remote-tracking branch 'origin/token-override' into orocrm

Conflicts:
	Security/Core/Authentication/Provider/OAuthProvider.php