Merge "Fix nosdn-fdio deployment errors"