Maybe you could have a look at https://github.com/picketlink/picketlink/pull/496?