SchemaResolver: backport changes from develop.
Fix folder name case.
Merge pull request #1370 from bpindelski/schemaresolver

Update SchemaResolver.java on dev_4_4 with changes from develop