fix enable/disable subaccounts and add private licence disable/enable checkbox
Merge branch 'merge-upstream' of https://github.com/m-narayan/canvas-lms into merge-upstream