Cherry-pick the patch attempting to fix nova service hanging
Cherry-pick the patch attempting to fix nova service hanging

cloudbase/nova-ci,rbuzatu90/nova-ci,cloudbase/nova-ci,costingalan/nova-ci,rbuzatu90/nova-ci,costingalan/nova-ci