Merge "Sonar fixes in EdgeRuleQuery.java"