CDB-1993 Properly returning quota exceeded message upon merge tables
Merge CDB-1993 into release/2.11.1