removed old error management CDB-1986
Merge CDB-1986 into release/2.11.1