merged changes from 3.18
a few compilation bug fixes
Merge branch 'master' of github.com:KyleBenson/ns3