[gfs2-utils] branch main updated: Misc. cleanups