#1394: Use the old set of public's blocks when removing from children. Remove reset to defaults if blocks are the defaults.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7