Add Ranjan's patch for cloud service

Changes get_cloud_service to not return a boolean