Use service tracker to correctly track command services and which also helps us avoid some locking issues. (FELIX-2378, FELIX-2379)