Sync Oslo service module to Ironic

New Oslo service code does correct stop Ironic conductor service from
screen session on devstack (screen -S stack -p ir-cond -X kill),
otherwise multiple conductors started on devstack after few
unstack/rejoin-stack cycles.

Change-Id: Ia8b4523e1288ca0817b94f85070f78237908a410
Merge "Sync Oslo service module to Ironic"