Rename span_{help, note}_and_lint to span_lint_and_*
#5098
Merged
span_{help, note}_and_lint to span_lint_and_*
#5098