Merge "Changes the name from cloudsearch_service to cloudsearch"