Merge branch 'cherry-pick-7b8d754e' into 'master'

Adjust spec to build correct path when storage path ends in slash

See merge request gitlab-org/gitlab-ee!5632