Merge "Heat upstream default policy.json works in devstack"
authorJenkins <jenkins@review.openstack.org>
Wed, 22 Jun 2016 15:35:24 +0000 (15:35 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 22 Jun 2016 15:35:25 +0000 (15:35 +0000)

Trivial merge