Merge "Add a zuul client"