Fixed clients arg and docs for clients hash
Allow custom client_config template
Merge commit '8f2b71896a6a3799abe34d3f0b5df400d4422e52'
Merge commit '5872d7a652271b31dbaf340baa6e72ec6c413e69'