Merge pull request #1787 from TDT-AG/pr/20180509-net-mwan3-fixes