Updates from AWS Doc team
Merge branch 'EronHennessey-doc-updates' into develop

* EronHennessey-doc-updates:
  Updates from AWS Doc team