Merge pull request #156 from stianst/master

Fix broken test
Arquillian
Fixed CORS filter for KC admin resources