Fix 'Reset to Defaults' on the layout form, #1525
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into SCHOLAR-3.x