From https://review.openstack.org/#/c/28198/
Change-Id: Ia9842c2b355dabe7938f460a1e6ecf774af9627d
Reviewed-on: https://review.openstack.org/28200
Reviewed-by: Anne Gentle <anne@openstack.org>
Reviewed-by: Emilien Macchi <emilien.macchi@enovance.com>
Reviewed-by: matthew-wagoner <matthew.wagoner@hp.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Jesse Keating <jesse.keating@rackspace.com>
Approved: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Tested-by: Jenkins