Bug 465986 - during reconcile role files are not properly added to the
team's TypeDeclaration
- fix ordering issues in testSimpleCopyInheritanceSmapRoleA et al
4 files changed