Merge "Enable surefire unit tests"