Merge "Fix sonar code coverage for BridgeConfigurationManagerImpl.java"