Merge pull request #1166 from OndroMih/ondromih-fix-resolveContext-with-parent

Search for scope first in parent locator