ESPD Request does not correctly export yearly turnovers

[virgiliu-ratoi-ec-ext]

In version 2017.06 there was a restructuring of the following criteria:

• General yearly turnover
• Specific yearly turnover.

Unfortunately, when exporting an ESPD Request that contains these two criteria, only one year reference is generated, instead of 5.

[virgiliu-ratoi-ec-ext]

The bug was introduced by this previous issue: #148.

[virgiliu-ratoi-ec-ext]

There is also the problem that if we have 'General yearly turnover' and 'Specific yearly turnover' criteria at the same, the requirement values of 'General yearly turnover' will be overwritten with the values of 'Specific yearly turnover'.