WIP #3315 - schema cleanup
WIP #3315 - schema cleanup

radiasoft/sirepo,radiasoft/sirepo,mkeilman/sirepo,mkeilman/sirepo,mkeilman/sirepo,radiasoft/sirepo,radiasoft/sirepo,mkeilman/sirepo,radiasoft/sirepo