Merge "Bug 526153 - Specification code generation does not produce code for imported domains"