Use an isolated scope for the fileUpload and fileUploadProgress directives. Closes #2578
Merge branch 'master' into gh-pages