FL-1572: virtual/perl-Data-Dumper clean-up