Merge pull request #7344 from haberman/sync-integrate

Integrate from Piper @304070343 for C++, Java, and Python

Author: haberman

message_test.js

@@ -1080,7 +1080,7 @@ describe('Message test suite', function() {
 
   it('testMessageWithLargeFieldNumbers', function() {
     var message = new proto.jspb.test.MessageWithLargeFieldNumbers;
-    
+
     message.setAString('string');
     assertEquals('string', message.getAString());