Merge pull request #1292 from clebertsuconic/2.3.x

https://community.jboss.org/thread/232591 - fixing typo only
https://bugzilla.redhat.com/show_bug.cgi?id=959641 - test
Merge pull request #1293 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=959641 - test
https://bugzilla.redhat.com/show_bug.cgi?id=959641 - make sure we clear the handlers
Merge pull request #1295 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=959641
avoiding /tmp on test as it can fail depending on the server's state