Fix default shutdown of child supervisors to infinity

A supervisor should wait for a child supervisor to shutdown its
children, and not kill it. By killing a supervisor you may prevent the
correct termination of processes further down the supervision tree.
Merge pull request #1546 from fishcakez/supervisor-shutdown

Fix default shutdown of child supervisors to infinity