Minor fix.
Merge branch '3448' of github.com:openscholar/openscholar into 3448
Fieldable entity.
Remove dpm.
Merge branch '3448' of github.com:openscholar/openscholar into 3448