Update generated proto and remove a test from failure_list

conformance/failure_list_ruby.txt

@@ -65,4 +65,3 @@ Required.Proto3.JsonInput.IgnoreUnknownJsonNumber.ProtobufOutput
 Required.Proto3.JsonInput.IgnoreUnknownJsonObject.ProtobufOutput
 Required.Proto3.JsonInput.IgnoreUnknownJsonString.ProtobufOutput
 Required.Proto3.JsonInput.IgnoreUnknownJsonTrue.ProtobufOutput
-Required.Proto3.JsonInput.EmptyFieldMask.JsonOutput

csharp/src/Google.Protobuf/Reflection/Descriptor.cs

@@ -4345,8 +4345,8 @@ namespace Google.Protobuf.Reflection {
     private string phpMetadataNamespace_;
     /// <summary>
     /// Use this option to change the namespace of php generated metadata classes.
-    /// Default is empty. When this option is empty, the proto file name will be used
-    /// for determining the namespace.
+    /// Default is empty. When this option is empty, the proto file name will be
+    /// used for determining the namespace.
     /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string PhpMetadataNamespace {

php/src/Google/Protobuf/Internal/FileOptions.php

@@ -175,8 +175,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message
     private $has_php_namespace = false;
     /**
      * Use this option to change the namespace of php generated metadata classes.
-     * Default is empty. When this option is empty, the proto file name will be used
-     * for determining the namespace.
+     * Default is empty. When this option is empty, the proto file name will be
+     * used for determining the namespace.
      *
      * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
      */
@@ -280,8 +280,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message
      *           determining the namespace.
      *     @type string $php_metadata_namespace
      *           Use this option to change the namespace of php generated metadata classes.
-     *           Default is empty. When this option is empty, the proto file name will be used
-     *           for determining the namespace.
+     *           Default is empty. When this option is empty, the proto file name will be
+     *           used for determining the namespace.
      *     @type string $ruby_package
      *           Use this option to change the package of ruby generated classes. Default
      *           is empty. When this option is not set, the package name will be used for
@@ -938,8 +938,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message
 
     /**
      * Use this option to change the namespace of php generated metadata classes.
-     * Default is empty. When this option is empty, the proto file name will be used
-     * for determining the namespace.
+     * Default is empty. When this option is empty, the proto file name will be
+     * used for determining the namespace.
      *
      * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
      * @return string
@@ -951,8 +951,8 @@ class FileOptions extends \Google\Protobuf\Internal\Message
 
     /**
      * Use this option to change the namespace of php generated metadata classes.
-     * Default is empty. When this option is empty, the proto file name will be used
-     * for determining the namespace.
+     * Default is empty. When this option is empty, the proto file name will be
+     * used for determining the namespace.
      *
      * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
      * @param string $var