Merge pull request #360 from patriot1burke/master

adatper deployment context fixes, picketlink abstraction
Fix breadcrumb for audit pages£
KEYCLOAK-441 Remove org.json
Merge pull request #363 from stianst/master

Removed org.json
merge fixes