Merge branch 'fix-some-issues-in-netdevsim-driver'