Merge "Replace default to be more robust"
authorJenkins <jenkins@review.openstack.org>
Fri, 24 Feb 2017 14:12:29 +0000 (14:12 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 24 Feb 2017 14:12:29 +0000 (14:12 +0000)

Trivial merge