AGSEC-63 - Refactor AeroGear Security and Update to PicketLink beta4