Merging ns-3 into nepi-3-dev