Final updates for manual enrollments
Merge branch 'development' of github.com:dchbx/hbx_enterprise into development
Merge branch 'development' into release-2.0