Validated PR114, added a few more fixes
Merge branch 'develop' of github.com:magento/devdocs into PR114_airbone42