- When editing a comment, only edit that comment and not nested forms.
- Add the discussion to the data array when editing a comment so we can generate the options menu properly.
Merge branch 'release/2.2' of github.com:vanillaforums/Garden into release/2.2