Merge "Prepare 7.0.0.0b1 (pike-1)"
authorJenkins <jenkins@review.openstack.org>
Fri, 7 Apr 2017 21:36:45 +0000 (21:36 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 7 Apr 2017 21:36:45 +0000 (21:36 +0000)

Trivial merge