Merge "BUG-869: fixed code style violations in TypeProviderImpl reported by Sonar"