Update to 0.4.0, reordered tuple alphabetically for sanity and cleanup fixed items upstream
PR: 221868
Submitted by: Alexandru Ciobanu (maintainer)
Reviewed by: lifanov (mentor), matthew (mentor)
Approved by: lifanov (mentor), matthew (mentor)
Differential Revision: https://reviews.freebsd.org/D12209