[Client] Move hostfetcher out of client code
Merge branch 'cluster'