Merge branch 'dz-fix-extract-path' into 'master'

Improve ExtractsPath logic related to atom format

* Fixes one test from https://gitlab.com/gitlab-org/gitlab-ce/issues/23378. 
* Fixes issue introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6750.

See merge request !6907