Merge "Added Sonar fixe for JetttyServer.java"