Reduce delay to 5 seconds when stopping supervisord

Change-Id: I45d039d5ae95d6a1a529b79db77bc2c7ce26c8d0
Closes-bug: #1272550
Merge "Reduce delay to 5 seconds when stopping supervisord"