Multi-Machine Scaling of the Divertor Peak Heat Flux and Width for L-Mode and H-Mode Discharges