Merge branch 'wkalinin-override_fix'

* wkalinin-override_fix:
  test case added for "override" from imported module
  #733 - wrong "override" calculation in import mode