Refactor control.simple from a DatumDao to a DatumDataSource that returns GeneralNodeDatum. This is so the bulk upload job is not tied to reading from controls, which might block and not return. Now just the control logger job will fail if that happens.