LilyPond devel 2.17.21

Closes #20984.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>