6916796 OSnet mapfiles should use version 2 link-editor syntax
6455532 OSNet cleanup required in preparation for direct bindings