[OE-3674] - completed consolidation
[OE-3674] - added pre-consolidation check on tbl_migrate
Merge branch 'jira/3674' into develop