Merge "Add Sap service into disconnect all enabled profiles process"