Be less restrictive on key comment extraction

Administratorrequested to merge
github/fork/cinderblock/master into master

Created by: cinderblock

This is the same pull request as #8515, rebased to the current master.

Merge request reports