Fix conflicting annotations for multiple-database scenario#892

afn wants to merge 1 commit intoctran:developctran/annotate_models:developfrom

cygnuseducation:fix-891-multiple-database-table-name-conflictcygnuseducation/annotate_models:fix-891-multiple-database-table-name-conflictCopy head branch name to clipboard