Consolidated and alphabetically sorted Docbook entities.

Change-Id: Ic26a7d52b7693bdc85b466b541d405eaa21a4e24
Signed-off-by: Marek Potociar <marek.potociar@oracle.com>
Merge "Consolidated and alphabetically sorted Docbook entities."