Merge "Stop SSHD profile clobbering SSH client config" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Tue, 25 Apr 2017 16:22:43 +0000 (16:22 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 25 Apr 2017 16:22:43 +0000 (16:22 +0000)

Trivial merge