It looks like there is no necessity to re-enable shadows on your "bakedlightmap-add-shadowmask-3.x" branch.
You need to re-enable shadows if you want the lightmapped object to cast shadows onto dynamic objects. Keeping shadows disabled is slightly faster, but it will look worse if dynamic objects can get under the lightmapped object's shadow.