Implements AMQ-4990: Add support for the changes in MQTT 3.1.1