Merge of patch in Flume-3021?

[Wahrmann, Helmut]

Hi,

now that the blocker for FLUME-3021 is removed by committing FLUME-2957, can we 
get the patch from 3021 merged to trunk?

Thanks,

Helmut