Instead of the original content of this JIRA, substitute a request for the server to be able to send to the client the actual keepalive time it will implement in any case where this is not what the client requested.
Add an Identifier/Value pair on CONNACK for this.