Upgraded to picketlink-extensions