Merge "Handle CDB errors more gracefully in cdb.php maintenance script"