On the extension of cylindrical acoustic waves to acoustic-vortical-entropy waves in a flow with rigid body swirl