SYMPHONY-1619 Additional improvements/fixes to service installation.