Fix start of required services during upgrade

Merged Marin Jankovski requested to merge fix_service_start_on_upgrade into master