Merge "Refactor/add tests for ObjectStreamClass computeDefaultSUID"