Issue #1552412 by duellj: Make API links point to D8 version, and where possible make them future-proof