Update from original#15

thevibepei wants to merge 5 commits intonsnam:masternsnam/ns-3-dev-git:masterfrom

thevibepei:masterthevibepei/ns-3-dev-git:masterCopy head branch name to clipboard