OSNG-8
removed some sonar violations
Merge remote-tracking branch 'origin/master'

Conflicts:
	oauth2-client/src/main/java/org/osiam/oauth2/client/AccessTokenServlet.java