Merge "Fix all bugs reported by Sonar in policy/engine"