Merge "OpenSearch: Error for unsupported formats and adding format=jsonfm"