#1678: Update file entity module
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7