Fix splitting algo with multiple SEs

It passes the unit tests, I first confirmed that the unit tests fail when I add the extra SE (splitting start creating more jobs than expected). After including the changes to the discovery DAOs, unit tests work again.