Applied various fixes for 6.0#407

daobrien merged 3 commits intodevStyleGuides/WritingStyleGuide:devfrom

jcable/6.0-fixesStyleGuides/WritingStyleGuide:jcable/6.0-fixesCopy head branch name to clipboard