Bringing conext engineblock repo up to date with cloudidentity updates

Including reference changes, more flexible encryption selection and creation of "schacHomeOrganization".