case 1683 - Refactor, so docbook stuff works fine within the existing relations display.
Merge branch 'case-1683' into develop
Merge remote-tracking branch 'origin/develop'