OOIION-1654: Fixed cleanup of duplicate directory keys
Merge pull request #439 from mmeisinger/fix1654_dir_m

OOIION-1654: Fixed cleanup of duplicate directory keys