Merge "EcompPortalUtils and SearchServiceImpl changes"