Update to 2.21
Reviewed by: kwm Approved by: swills (mentor) Differential Revision: https://reviews.freebsd.org/D11064