Merge "Added support for parsing yang models with already resolved context."