Merge remote-tracking branch 'origin/6.3' into 6.4

* origin/6.3:
  [Workflow] Cleaning code
  [Scheduler] Fix NPE in debug:scheduler command

Author: lyrixx

Resources/config/schema/symfony-1.0.xsd

@@ -447,8 +447,6 @@
 
     <xsd:simpleType name="marking_store_type">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="multiple_state" />
-            <xsd:enumeration value="single_state" />
             <xsd:enumeration value="method" />
         </xsd:restriction>
     </xsd:simpleType>

Tests/DependencyInjection/Fixtures/xml/workflows.xml

@@ -11,7 +11,6 @@
         <framework:workflow name="article" type="workflow">
             <framework:audit-trail enabled="true"/>
             <framework:initial-marking>draft</framework:initial-marking>
-            <framework:marking-store type="method" property="state" />
             <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="draft" />
             <framework:place name="wait_for_journalist" />