Merge MySQL 5.7.23.
Verify upstream fixes, revert ours, keeping the testcases as needed, for:
Merge MySQL 5.7.22
Merge MySQL 5.7.24
LP #1623058: Restoring a dump of binary column, made with mysqldump, warns of invalid string
thd->derived_tables_processing is not restored by TABLE_LIST::resolve_derived in case of error