Qa calls

Merging qa_calls into Master.
The name of this method implies that a single object will be returned, but depending on the type of the `id`, it can either return a single object or a collection of objects. It would probably be better to call `first` on the result of `servers`.