instances not stopping in time, causing failed jobs

Change-Id: I7efa61312811a328d51db16ba65d27fe98827d93
minor: corrects intendation in common-handlers

Change-Id: Ic2aa90032569bebe984b8271edf1b1fdfd6998bf
Merge remote-tracking branch 'gerrit/master' into dev/reorg

Change-Id: I377ca1b76ee67d3fb3fe23fe40defb18e669b44f