Merge "Restore the NtpServer parameter name"
authorJenkins <jenkins@review.openstack.org>
Thu, 7 Jul 2016 07:52:05 +0000 (07:52 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 7 Jul 2016 07:52:05 +0000 (07:52 +0000)

Trivial merge