if upload directory is set, allow browsing to default to directory
Merge pull request #1775 from rossriley/browse-upload-dirs

if upload directory is set for contenttype, browsing defaults to directory