Workaround potential failure to shutdown services
Workaround potential failure to shutdown services

Kill them twice to make sure they're good'n'dead. There is a supposed
fix to oslo-incubator code, but we're working around that here in the
meantime with this change.

This returned in Liberty.

Change-Id: I02a7af995dc7de857c4efcf2cef2f95d357c007a
Related-Bug: #1446583
(cherry picked from commit 953baa7998f253681ed31013fd18bd8aa8098b34)

Mahito/devstack,bswartz/devstack,richliu/devstack,group-policy/devstack,varunarya10/devstack,pombredanne/devstack,openstack-dev/devstack,dtroyer/devstack,prithivm/branch01,noironetworks/devstack,mssumanth/devstack,richliu/devstack,dirkmueller/devstack,samgoon/devstack,group-policy/devstack,nawawi/openstack,prithivm/branch01,varunarya10/devstack,mssumanth/devstack,pombredanne/devstack,ozamiatin/devstack,samgoon/devstack,Mahito/devstack,avvocatodemarchis/devstack,noironetworks/devstack,bigswitch/devstack,nawawi/openstack,dtroyer/devstack,openstack-dev/devstack,avvocatodemarchis/devstack,bigswitch/devstack,thomasem/devstack,ozamiatin/devstack,thomasem/devstack,dirkmueller/devstack,bswartz/devstack