adatper deployment context fixes, picketlink abstraction