Feature/upgrade cometd3