Merge "Fixed sonar issues in PropertiesListners.java"