upgrade wicket & atmosphere
Revert "upgrade wicket & atmosphere"

This reverts commit 9afa07774ecc9a7909066379e3d58d8b88a72445.
Merge remote-tracking branch 'origin/2.1.x'