Fix Bug #1101392 Cherry picked from https://review.openstack.org/#/c/20490/ Change-Id: I4b1abeae547a8a2461889ce33c7066959cd11af6
Fix Bug #1101392 Cherry picked from https://review.openstack.org/#/c/20490/ Change-Id: I4b1abeae547a8a2461889ce33c7066959cd11af6