Merge "Fixed Sonar Issues in EgressRoute.java"