Rapid calculation of the pressures and clearances in rough, rolling-sliding elastohydrodynamically lubricated contacts. Part 2: General, non-sinusoidal roughness