Merge "nosdn-fdio scenarios fixes"