Merge "Adds friendly zone name support"
authorJenkins <jenkins@review.openstack.org>
Tue, 26 Jan 2016 00:42:41 +0000 (00:42 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 26 Jan 2016 00:42:41 +0000 (00:42 +0000)

Trivial merge