Bringing conext engineblock repo up to date with cloudidentity updates

Including update of SURF references, more flexible selection of encryption for UK Federation, and creation of "schacHomeOrganization".