Fix saltmod & saltutils due to #11337 & f798c953 breakages