MDLSITE-2689 Reword a bit the messages from CiBoT

A very very hacky solution to this, see my commit comments!