Modifies the getSockOption and setSockOption, using now java Objects.
Add flag constants.
Merge branch 'java-api' into next