[OS-BUILD PATCH 0/0] A few updates to the module filtering files for this merge window after experiences with -next