1.18.0

Adds support for the split upcoming repositories (i.e. 3.5-upcoming and 3.6-upcoming).
Also adds promotion routes for the 3.6 series.