WP-2253 Added make/profile changes for cmis