Merge remote-tracking branch 'origin/token-override' into orocrm

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