Merge pull request #2541 from vlakoff/develop-4

Proper directory_map test skip