FELIX-3680 Intermediate commit which disables read lock, synchronizes service registration, moves service listener deregistration to deactivate thread (controlled by flag)