Merge pull request #805 from stianst/master

Fixes
Merge pull request #806 from stianst/master

KEYCLOAK-772 Event settings are not imported
add tomcat7 adapter test
Merge pull request #807 from patriot1burke/master

add tomcat7 adapter test
KEYCLOAK-726 Downloading a OAuth client installation file results on wrong JSON