Merge 785126 from 2.x trunk to M3 to fix Commented import resolving code from XSDModelResolver as its not applicable for in-line schemas