PR97 with some additional cleanup
Merge branch 'develop' of github.com:magento/devdocs into PR97_seansan