Updated to RabbitCommon 2.2.4