DOCS-1603, DOCS-3404

Signed-off-by: Sam Kleinman <samk@10gen.com>