Merge "Tolerate missing keys from role_data in service templates"
authorJenkins <jenkins@review.openstack.org>
Fri, 23 Sep 2016 11:35:10 +0000 (11:35 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 23 Sep 2016 11:35:10 +0000 (11:35 +0000)

Trivial merge