Fix that the resources are not inherited from older version's resources. bugid:111790
Fix tests.
Fix tests.