JOE for JOC Cockpit creates wrong xml when using include parameters files

Current Situation

When a job or order makes use of the "include" element to read parameters from a file then the generated xml file is wrong.

  <params >
        <param  name="param" value="value1"/>    
        <includes  live_file="file1.xml" node=""/>
        <includes  live_file="file2.xml"/>
    </params>

Desired Behavior

When a job or order makes use of the "include" element to read parameters from a file then the generated xml file should look like this:

  <params >
        <include  live_file="file1.xml" node=""/>
        <include  live_file="file2.xml"/>
        <param  name="param" value="value1"/>    
    </params>

• <include> instead of <includes>
• First the <include> elements then the <param> elements.