CQ Xiao

PR merged.

> Thanks for the PR! can you please also mention the changes in CHANGELOG as well? Updated.

Moved the code to apply broker returned session_expiry_interval here, please check.