The photon angular momentum controversy: Resolution of a conflict between laser optics and particle physics