OOIION-1654: Fix overly restrictive directory cleanup restriction
Merge pull request #443 from mmeisinger/fix1654_dir2_m

OOIION-1654: Fix overly restrictive directory cleanup restriction