BRANCH 4.2-105: made import of schema entry more reliable