Update docblocks in Association
Merge pull request #2627 from bcrowe/3.0-association-docblocks

Update docblocks in Association