Improving usability, removing unnecessary services and reload state.
Handling rollback when necessary.
Removing unnecessary code.
Merge pull request #6951 from pedroigor/master

[WFLY-3978] - PicketLink EAP 6.4 Issues