Allows File upload to work if site not using mod_rewrite
Merge pull request #2410 from donaldallen/2.2/fileUploadNon-mod_rewrite

Allows File module upload to work if site not using mod_rewrite