Fix notice on editing shield
Merge branch 'SCHOLAR-3.x' into 5046
More cleanup.
REmove.
fix
Fix.
Merge pull request #5048 from openscholar/5046

Fix shield widget