LPS-32382 BookmarksFolderServiceTest search should be synchronous
LPS-32382 DLAppServiceTest search should be synchronous
Merge branch 'master' into FIX_PORTLET_PREFERENCES