Make rabbit_mqtt_sup a supervisor2
merge stable into default