Fixes DOC-465
Merge branch 'master' of git+ssh://git.eucalyptus-systems.com/documentation
DOC-683: Final edits.

Conflicts:

	tools/DITA-OT/lib/org.dita.dost.platform/plugin.properties
Cherry picking changes from 3.2.0 to 3.3.3.
Merge branch 'master' of git.eucalyptus-systems.com:documentation