TRUNK-4236: SonarQube - Redundant nullcheck of value known to be non-null
Merge pull request #575 from lrozanski/TRUNK-4236

TRUNK-4236: SonarQube - Redundant nullcheck of value known to be non-null