Merge "Server blacklist support"
authorJenkins <jenkins@review.openstack.org>
Fri, 2 Jun 2017 23:12:08 +0000 (23:12 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 2 Jun 2017 23:12:08 +0000 (23:12 +0000)

Trivial merge