Use dirspec instead of plain xdg. Closes #3574.
Merge remote-tracking branch 'ivan/feature/3574_use-dirspec-instead-of-xdg' into develop