Make sure rename_config_option properly handles when old does not exist or...

Make sure rename_config_option properly handles when old does not exist or when both old and new exists