Description of problem:
We need this to be back ported to OSP 10, so upgrades can be possible
https://review.openstack.org/#/c/456382/
Version-Release number of selected component (if applicable):
How reproducible:
Steps to Reproduce:
1.
2.
3.
Actual results:
Expected results:
Additional info: