New rifle, light machine gun headed to close combat troops