[WFLY-3978] - PicketLink EAP 6.4 Issues

...der element.
Perhaps this extra step should only be added for affected attributes?