Merge "Check if service is available for cli tests"