Merge pull request #1287 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=959641
https://bugzilla.redhat.com/show_bug.cgi?id=1009409 - Ignoring Interrupted Exception
https://bugzilla.redhat.com/show_bug.cgi?id=1009530: Exceptions on deactivate shouldn't interrupt the server stop
Merge pull request #1291 from clebertsuconic/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=1009409 - Ignoring Interrupted Exception
https://community.jboss.org/thread/232591 - fixing typo accordingly to user
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