IDI-104: Merge in Heidi's work on the admin settings for UIO integration.