Fix logging

Conflicts:
	modules/cpr/src/main/java/org/atmosphere/container/version/GrizzlyWebSocket.java
Fix trivial typo
Improve logging
logging
Port fixes