Merge "Fix CTS test fail for isTreeUri check in findDocumentPath method"