Issue 2158 cmis timeout and performance

Updated the code to improve cmis performance