OK. Just review it, please, fully and I'll push the fix after. 
I think we should raise `IllegalArgumentException` in case of `JMSCorrelationID*` and `listener-contaier`. 
Doesn't make sence to fallback to default behaviour