e0f19f39cd
This should be merged first https://review.openstack.org/#/c/519340/ Change-Id: I8ed1540b024bfcfaad1221d4e4a0da4a56b56c3c Task: 5834 Story: 2001286