Fixes #228.  Still need to verify everything still works on Linux & Mac
Merge pull request #236 from pencilblue/issue/PB228

Fixes #228.  Corrects inability to upload media on windows with FS Media Provider
Merge branch 'master' into PB220
#220 test email code review changes