Merge pull request #863 from patriot1burke/master

proxy
Merge pull request #864 from patriot1burke/master

proxy constraints
Fix CookieTokenStoreAdapterTest sometimes failing
Fix location of Tomcat6 home to be inside target
Merge pull request #865 from mposolda/master

Minor fixes in testsuite
KEYCLOAK-857 add getter/setter for principalAttribute to AdapterDeploymentContext
Merge pull request #866 from mposolda/master

KEYCLOAK-857 add getter/setter for principalAttribute to AdapterDeployme...
KEYCLOAK-858 avoid creating inner DeploymentDelegate for each request
Merge pull request #867 from mposolda/master

KEYCLOAK-858 avoid creating inner DeploymentDelegate for each request
proxy config 2
Merge remote-tracking branch 'upstream/master'