Commits for SharkServer2
Merge branch 'SharkServer2' into shark-0.11-ojdk7