Merge "rdbms: lower value of MAX_LAG_DEFAULT to 6"