OOIION-1654: Fix overly restrictive directory cleanup restriction