WP-2606 Added patch for cmis_common.