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

OOIION-1654: Fix overly restrictive directory cleanup restriction