Add supervisord to keep everything running smooth

Change-Id: I9353b118837b8b444b11e122ab691d235d5a0166
Merge "Add supervisord to keep everything running smooth"