https://issues.apache.org/jira/browse/AMQ-5301

 This closes #38
https://issues.apache.org/jira/browse/AMQ-5298

Fix the NPE case
https://issues.apache.org/jira/browse/AMQ-5290

Clean up some code to make future work a bit simpler.
move to pax exam 3.4.0
Merge remote-tracking branch 'upstream/trunk' into trunk