LPS-50031 Improve Service Tracking in 6.2.x modules

@csierra 
@juliocamarero