Problems baking light after updating Unity to 5.6.1f1

Hi guys,
For some reason I decided to update Unity to the most current version whilst in the middle of a project.
Now, lightmaps that used to take less than a minute to bake just freeze at 5/11 clustering. Neither the scene nor the settings have changed, however the Lighting panel is very different than before the update. I used to be running Unity 5.5.2f1. Is this a known issue?

I have a similar problem, changing the version and tried to bake again. In the last version it takes around 2 days to bake, but now it hasn´t finished yet after 5 attempts.
I gave up and use only real time GI.

Unfortunately, I can’t afford to do that since I’m developing for mobile VR. The other thing that occurs when I bake (after keeping only one object and a terrain in my scene) is that the terrain becomes completely black after the bake.

So after spending the whole day tinkering with my scene, I noticed that my Mesh Filter component on my static objects was set to “Combined mesh (root scene)”. It seems they were altered with the update without me noticing. Upon closer inspection, this combined mesh looked like it was a mesh of my whole scene. Which also explains why Unity was spewing the errors: “Object’s size in lightmap has reached the max atlas size” and “clustering operation failed…out of memory loading input data…”. Once I reverted the Mesh Filters on all affected objects to their original Mesh Filters, I was able to bake my scene at the usual speed.

Is this the same issue as this:
https://forum.unity3d.com/threads/unity-generated-combined-meshes-permanetly-saved-in-scene-if-build-is-cancelled.453916/#post-3070002