Merge pull request #2158 from pmauduit/java_atomic_types