making the other key name in BelongsTo and HasOneOrMany respect the relationship definition (Closes #715)