Merge "Release pike-3"
authorJenkins <jenkins@review.openstack.org>
Mon, 24 Jul 2017 18:05:37 +0000 (18:05 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 24 Jul 2017 18:05:37 +0000 (18:05 +0000)

Trivial merge