Merge "Prepare 6.0.0 (ocata-1)"
authorJenkins <jenkins@review.openstack.org>
Wed, 16 Nov 2016 18:33:58 +0000 (18:33 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 16 Nov 2016 18:33:58 +0000 (18:33 +0000)

Trivial merge