Modified table registration rake task
Merge remote-tracking branch 'origin/master' into CDB-1555