Cleaned up MergePolicyProvider. Fixed sonar issues.
Merge pull request #3392 from mdogan/fix/3.3/merge-policy

Cleaned up MergePolicyProvider. Fixed sonar issues.