Added support for changes coming to Bro 2.4 with back support for 2.3.