#1754: Rename labels in Media Browser. Errant dpm.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7