Path resolution cleanup
[ref: CWPBUG-158]
Merge pull request #3085 from tractorcow/pulls/3.1-path-checking

Path resolution cleanup