Warden infrastructure stub now appropriately merges uaa.clients when spiffing.