Merge "Bug 531303 - Resource classes are not imported for extended resources in external spec"