Fix a couple things for external association trait
Merge pull request #2698 from bcrowe/3.0-ext-assoc-trait

3.0 - Fix a couple things for external association trait