Allow override_options set to undef to completely remove the corresponding key reverting to the mysql default

This is on top of #426.