#1678: Fix our js for changes in file entity upload form.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7