Remove stray and unnecessary VERSIONs in modules

Some of these are because the module was folded into core, but some are
somehat inexplicable and confusing.
Merge branch '4.2/remove-unnecessary-version'