More Post-merge fixes

storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.def

@@ -28,4 +28,5 @@ rpl_gtid_crash_safe : Didn't try with MariaDB, yet
 rpl_gtid_crash_safe_wal_corrupt : Didn't try with MariaDB, yet
 rpl_rocksdb_snapshot : Didn't try with MariaDB, yet
 rpl_rocksdb_snapshot_without_gtid : Didn't try with MariaDB, yet
-
+rpl_rocksdb_slave_gtid_info_optimized: requires slave-gtid-info=optimized which is an FB/MySQL-only feature
+slave_check_before_image_consistency: requires slave_check_before_image_consistency feature

storage/rocksdb/mysql-test/rocksdb_sys_vars/t/rocksdb_delete_cf_basic-master.opt

---force-restart
+--loose-rocksdb-dummy-option-instead-of-force-restart