Updated to phloc-jms trunk