Added file.pardir and file.join execution module functions
Merge pull request #13055 from whiteinge/salt-file-join

Added file.pardir and file.join execution module functions