Comment 4 for bug 1396161

Josh, good suggestion to fix the docs for bug 1205072. However, since that bug already has release notes included, the Docs Interest Group (DIG) will update the docs appropriately when that bug fix is released. I added a comment to that bug about the script help text, though, so that part doesn't get missed. As for this bug, I think this branch is ready to go for 2.7 and earlier.