Puppet37

Edits to address 3.7 doc tickets: 
DOCS-1137
DOCS-1130
DOCS-1148