FELIX-1177 Better handling of IllegalStateException thrown when getting the service registration lock fails and retry service unregistration if not possible in the first place FELIX-1178 Add m_pendingDeactivation flag to ensure a component is scheduled for activation if deactivation is scheduled but the component is still active if a service reference change occurrs