CB-8204: Reinstate link tasks to avoid gradle build failures
Merge branch 'master' into 4.0.x (Gradle lint stages)