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

Reviewed the patch and it looks good, I made a small change to prevent
logging in the case where no old context exists so we don't spam the
logs.