adding rest of ns-3 to mdc branch