COOK-2337: using merge instead of merge!
(cherry picked from commit cdc96be8465160665004d68670015a3d5cb13cf3)
Autostart supervisor service.

This fixes the need to start your application manually if you reboot your server.(cherry picked from commit e163fbfaf48d23030ebceedf6514057c8ece30a7)