More improvements for AMQ-5043.  Reworked the MQTT inactivity monitor so that it's more accurate.