Build and synchronization fixes for Better task reconciliation with build fixes

Looks like it's actually used in SingularityServiceModule and SingularityTestModule