CB-8204: Reinstate link tasks to avoid gradle build failures