Merge "Hotfix for resolving of remote yang schemas."