Nonlinear dynamics of straight fluid-conveying pipes with general boundary conditions and additional springs and masses