Updated to 5.0.0.CR2
Updated to 5.0.0.CR3-SNAPSHOT
https://issues.jboss.org/browse/JBTM-2057
https://issues.jboss.org/browse/JBTM-2057
https://issues.jboss.org/browse/JBTM-2056
https://issues.jboss.org/browse/JBTM-2056
Minor tidy-up around type and annotations.