DOC-1248: Addressed Marten's concern item #4
DOC-1248: Addressed Marten's concerns #9 and #9B
Merge branch 'master' of git.eucalyptus-systems.com:documentation