update WWW and reorder Makefile sections to make linters happy PR: 272963 Reported by: Graham Perrin <grahamperrin@gmail.com>