[1.5.x] Fixed errors and inconsistencies in CBV topic documentation.

Backport of bd9fbd1497edc585c5bec28c7d4bc8d1afd1943b from master.