Merge "NONRTRIC-979: ServiceManager - deployment and undeployment"