Add a note about moving to trunk-polyproj/8.5