Competition between hidden order and antiferromagnetism in URu2Si2 under uniaxial stress studied by neutron scattering