Merge pull request #483 from mposolda/master

KEYCLOAK-540 Broken project-integrations/aerogear-ups. Move keycloak-ser...
Disable cache as it's not working

Conflicts:
	project-integrations/aerogear-ups/auth-server/src/main/webapp/WEB-INF/keycloak-server.json
	server/src/main/resources/META-INF/keycloak-server.json
	testsuite/tools/src/main/resources/META-INF/keycloak-server.json
Refactor to prepar for splitting model
Return null for selected provider if empty string
Merge pull request #484 from stianst/master

Refactor to KeycloakSession
Added mail server to test tools
Merge pull request #485 from stianst/master

Added mail server to test tools
KEYCLOAK-543 Set sent date on emails
KEYCLOAK-541 Create session after resetting password through email
Merge pull request #486 from stianst/master

Bug fixes
KEYCLOAK-501 Check if old session for browser exists and delete before creating a new
Merge pull request #487 from stianst/master

KEYCLOAK-501 Check if old session for browser exists and delete before c...
Fix reset password test
Merge pull request #488 from stianst/master

Fix reset password test
Refactoring current performance test
Added performance-web module
Work in progress...
Change perf test to parse accessToken and refreshToken in Servlet. Support for logout
Added support for get-users-count and create-available-users into PerfTools
Add classes classifier to performance-tools war, so classes can be reused in performance-web module