Revert "Trying surefire 2.16 - fixed typo"

This reverts commit 39f742e463ca6650f4ac216963c5401b2938b99b.
Revert "Trying surefire 2.16"

This reverts commit 9f6f35ce174a2ccf34cde3a39f86e500ff9e83e3.
Revert "AMQ4887 Changes"

This reverts commit 004885a5b508e0ae6790e91141009dae45458cd5.