adatper deployment context fixes, picketlink abstraction
Merge pull request #360 from patriot1burke/master

adatper deployment context fixes, picketlink abstraction